From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 02 01:18:55 2024 Received: (at submit) by debbugs.gnu.org; 2 Jul 2024 05:18:55 +0000 Received: from localhost ([127.0.0.1]:35533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOVup-0004LV-75 for submit@debbugs.gnu.org; Tue, 02 Jul 2024 01:18:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:52984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOVum-0004LN-Ly for submit@debbugs.gnu.org; Tue, 02 Jul 2024 01:18:54 -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 1sOVul-0007rQ-E0 for guix-patches@gnu.org; Tue, 02 Jul 2024 01:18:51 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sOVuj-0003fG-Mt for guix-patches@gnu.org; Tue, 02 Jul 2024 01:18:51 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.nyi.internal (Postfix) with ESMTP id 6472B1380232 for ; Tue, 2 Jul 2024 01:18:47 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Tue, 02 Jul 2024 01:18:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm3; t=1719897527; x=1719983927; bh=oTtBvLPqU0 /eIjzWIHwxTjtsZfsx/v1ZqLle00PRuvM=; b=F+iCiyMxaTk1I4bTgnMXotsFj6 7APCl5qKwndmtt41Ts0LO9QHFr4PFKD9emmkyFTnVlOz14RKSBVwiEES2huKXASX Bg5JtfAWwdcLe/phgVS/IToyAyhlcC/Z1X/YbkPQ3EDBzz9K+SVfBu7CJO8JJk9s 0vqxMpviGGI6uWkJwazA3ZqVY4VfCQKw5Kxf9KTuXdK6ITEDYnM6eU6TpBO1z84s PMT/mJwEdGM8kDSRJR9hdniE4wlIPOrDk9VYPVpE2Bg81gjETv0404qOhcAbWNHU HUpCASf9HMFiONBY8c0UiMrlJE7l+3PMKgFvopDisX/e7kF0h35NOAH+qTxQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1719897527; x=1719983927; bh=oTtBvLPqU0/eIjzWIHwxTjtsZfsx /v1ZqLle00PRuvM=; b=dBWJqT1wDh4Y3kzN0GTXpNARWdFGE5lLH99jq8Sy567c zD17RwWbF8c3gktrhvLdn+0oHbKDFsH83FgMsuIAya1e5hcMjJ9r5NcHbEEwlrOd DDOgpCIQtmcFT1e/8tZwIjjhnBMTtBZ9mp1aJjcKBc/EHUO3JupN/vtAMde85TLJ FdvL1iP70+8+O9W4qrc8jlhxkRLfg4ISAAv73mV+D3fKpVwxh3HC9Z6X5dk9EKWH bKeUUvpffLB8Pe2llY6vGYMygmD3jU20vbG3f2azpdjPfxpCeMBp9HHjEqsNuvsk cz5o3pomDCTlUpiSnjqc0mSEi8m1obA3PuCTyt+0KQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeggdeludcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekredtre dtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgv rhhnpeelveelhfetheeuiedthfdvteelledvhffflefhkeffheekvdehffeigeektefgje enucffohhmrghinhepghhithhlrggsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 2 Jul 2024 01:18:45 -0400 (EDT) From: dan To: guix-patches@gnu.org Subject: [PATCH 1/2] gnu: Add cppgir. Date: Tue, 2 Jul 2024 13:18:27 +0800 Message-ID: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@dan.games> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=103.168.172.147; envelope-from=i@dan.games; helo=fout4-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * gnu/packages/glib.scm: Import (gnu packages pretty-print). (cppgir): New variable. Change-Id: Ifaf3af1642bb8cb4750ee4f679967fb57c9cc7e2 --- gnu/packages/glib.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b11046f05d..10d39e4fe2 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Saku Laesvuori ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,6 +72,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) @@ -1594,3 +1596,31 @@ (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 + (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") + (revision "0")) + (package + (name "cppgir") + (version (git-version "2.0" revision commit)) + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit commit))) + (sha256 + (base32 "1fa9nf4yljfarihaqj5kd98yysrky7q316mh6l5b1rq39ga15k9b")))) + (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)))) base-commit: 0f51ddd8dba6b69115d07f4a77ba70abb6521293 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 02 01:27:16 2024 Received: (at 71897) by debbugs.gnu.org; 2 Jul 2024 05:27:16 +0000 Received: from localhost ([127.0.0.1]:35549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOW2t-0004a8-Bb for submit@debbugs.gnu.org; Tue, 02 Jul 2024 01:27:16 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]:48659) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOW2q-0004Zt-HE for 71897@debbugs.gnu.org; Tue, 02 Jul 2024 01:27:14 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.nyi.internal (Postfix) with ESMTP id 6DD54138047C for <71897@debbugs.gnu.org>; Tue, 2 Jul 2024 01:27:06 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 02 Jul 2024 01:27:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1719898026; x= 1719984426; bh=7OzHoA/mUWU9BpsIbzJFltpNl/oyJZPcjx9EBko+y/I=; b=W mOsLeAYF16x/NUwlI0X7R1u5tOc8MrLGAxFuoC6KAzKg+aT5bn/nPIJYT/hcz7ZF ZlWsdSYA4Kc3EJ2b+AG5+blDSxkNtydqdG93QHP4EXetuzdO8pjxhiQuuz1G6U8g iB7F8h5ra1tjEOppXpoZYtSklZzolQMrFt0nR5c3jncGTqTY0Bj47zkL+LW3saiU xYKyputnYX4cihreQCd0DpBhQd4e1kZM0m4tnxHE0xY6nfZfAv3WKrvgjqo1Qapv 9tN0TBhahEOzLt6nh9M9EXjc1XC9Wq8uVkw132UCxzzDetisP71G1XpVcCqAqoev zO1ZiEGFP1YZ27ZfRJGCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1719898026; x=1719984426; bh=7OzHoA/mUWU9B psIbzJFltpNl/oyJZPcjx9EBko+y/I=; b=Ms2NiC22EW6LydLaDFIhRi9EL457S t4J85iRHCF6FfIXN/neR5IPBNOy74Oplp+lNo4agETYcA9qPXJf+Js9ZU7lAY77w m/yIH2PCV6OFFcfsPDD35ldHpGqKjNCOA48hqF8z6fPYaza5HJ6VUT9gq2yy17PU DOqSDL3fO33Rqz+A6FUgcUxmFF/vOVMuu7RfFwQO/bJQfNIZCR1hzKNGeoir7lP9 ts4JW/gZ3UTDvCy7aL3MoWFtS1p2QAi6yptP46p4Kj0cFGHn0G3BOr6E1FvtuiQx ENgiByDU2LpFBU2V8xCrSmE1LsVyj+cTGRg0xs10tDi2iU2NhQtGv99Eg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeggdelvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecufghrlhcuvffnffculdduhedmnecujfgurhephffvuf ffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgr mhgvsheqnecuggftrfgrthhtvghrnhepgfejuedutdelffefkeekieettdelteegudfgtd dtgedtgefhhfetteegtdejuefhnecuffhomhgrihhnpehgihhthhhusgdrtghomhdpkhhi thifrghrvgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Tue, 2 Jul 2024 01:27:04 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH 2/2] gnu: telegram-desktop: Update to 5.1.7. Date: Tue, 2 Jul 2024 13:26:49 +0800 Message-ID: <482b63aa82c0b054d34ab8e1da27a4c5421616d7.1719897489.git.i@dan.games> X-Mailer: git-send-email 2.45.2 In-Reply-To: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@dan.games> References: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. * gnu/local.mk (dist_patch_DATA): register them. * 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. (libprisma-for-telegram-desktop, xdg-desktop-portal-for-telegram-desktop): New variables. (telegram-desktop): Update to 5.1.7. [phases]: Add libprisma-for-telegram-desktop and xdg-desktop-portal-for-telegram-desktop. : New phase. [inputs]: Add boost, cppgir, expected-lite and gobject-introspection. Change-Id: I75441a6284e3755f510a7d3ba5746bfbb8acbb91 --- gnu/local.mk | 2 + .../telegram-desktop-unbundle-cppgir.patch | 95 ++++++++++++++++ .../telegram-desktop-unbundle-gsl.patch | 31 ++++++ gnu/packages/telegram.scm | 105 ++++++++++++------ 4 files changed, 202 insertions(+), 31 deletions(-) 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 cf6b1d61b3..ddce260961 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2135,6 +2135,8 @@ 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-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-unbundle-cppgir.patch b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch new file mode 100644 index 0000000000..a24dbe25bb --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch @@ -0,0 +1,95 @@ +From a5c42e07ae223d440ff11347e0cf1fd58fd383df Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 1/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/CMakeLists.txt | 4 +++- + external/glib/generate_cppgir.cmake | 7 ++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt +index 3c6fe4be..c862705f 100644 +--- a/external/glib/CMakeLists.txt ++++ b/external/glib/CMakeLists.txt +@@ -13,9 +13,11 @@ function(add_cppgir) # isolate scope + set(BUILD_EXAMPLES OFF) + add_subdirectory(cppgir EXCLUDE_FROM_ALL) + endfunction() +-add_cppgir() + + include(generate_cppgir.cmake) ++if (NOT CppGir_FOUND) ++ add_cppgir() ++endif() + generate_cppgir(external_glib Gio-2.0) + + find_package(PkgConfig REQUIRED) +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index c15d3f9e..9b0a5ac8 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 2.0) ++ + function(generate_cppgir target_name gir) + set(cppgir_loc ${cmake_helpers_loc}/external/glib/cppgir) + +@@ -17,6 +19,9 @@ function(generate_cppgir target_name gir) + ${cppgir_loc}/data/cppgir.ignore + ${cppgir_loc}/data/cppgir_unix.ignore + ) ++ if (CppGir_FOUND) ++ set(ignore_files) # rely on default ignore list ++ endif() + + set(gir_path) + if (IS_ABSOLUTE "${gir}") +@@ -33,7 +38,7 @@ function(generate_cppgir target_name gir) + --class + --class-full + --expected +- --ignore ++ "$<$:--ignore>" + "$" + --output + ${gen_dst} + +From eed39522952c15f448c54290454806dd011c4996 Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 2/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/generate_cppgir.cmake | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index 9b0a5ac8..2ad82277 100644 +--- a/external/glib/generate_cppgir.cmake ++++ b/external/glib/generate_cppgir.cmake +@@ -15,11 +15,12 @@ function(generate_cppgir target_name gir) + + set(gen_timestamp ${gen_dst}/${target_name}_cppgir.timestamp) + +- set(ignore_files +- ${cppgir_loc}/data/cppgir.ignore +- ${cppgir_loc}/data/cppgir_unix.ignore +- ) +- if (CppGir_FOUND) ++ if (NOT CppGir_FOUND) ++ set(ignore_files ++ ${cppgir_loc}/data/cppgir.ignore ++ ${cppgir_loc}/data/cppgir_unix.ignore ++ ) ++ else() + set(ignore_files) # rely on default ignore list + endif() + 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..f89d326a5c --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch @@ -0,0 +1,31 @@ +From a3ac6df0441b4caca28b1df87febc420e18942ce Mon Sep 17 00:00:00 2001 +From: Zephyr Lykos +Date: Mon, 23 Oct 2023 15:55:24 +0800 +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 8eaf19c5..344f9488 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) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 358374a5bb..4138dc3779 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -28,6 +28,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) @@ -82,11 +83,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 "5.1.7") (define libyuv-for-telegram-desktop - (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") - (revision "2439")) + (let ((commit "04821d1e7d60845525e8db55c7bcd41ef5be9406") + (revision "2440")) (origin (method git-fetch) (uri (git-reference @@ -97,67 +98,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 "a7527c0e6eba1c71cd0dfd7bd8de9c1e68cb529f"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) + (patches + ;; https://github.com/desktop-app/cmake_helpers/pull/320 + ;; https://github.com/desktop-app/cmake_helpers/pull/305 + (search-patches "telegram-desktop-unbundle-gsl.patch" + "telegram-desktop-unbundle-cppgir.patch")) (sha256 (base32 - "0y96mvzs113zh8bdw1h3i6l0pgwg93rigrday8kfdg4magz686k6")))) + "176saaaiww9ivmqdi50by7vgq5j7jhqpyzp74lpy1xg83am4malf")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "1a969faa0afb29d53af03e530775eccdfb8433f1"))) + (commit "0af136124083369073b8fdaf45f0816fd2b10bad"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1xmw8dfm51p5g20rlmzqnr72a14ngyxwq09an8clf1v5s6mmwvak")))) + "057bwn9smrgnyfb1vraf50ihbkhjc4d72msl7vnbqc4h5sg8dav9")))) (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 "4d56f8b4bba52b46844f46fafa5f9b6b2704429e"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83")))) + "1xc6www5bgbl94wp2fg0gxcmv1b2j0z1pyxhmmhp06jvfqx6anqy")))) (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 @@ -188,24 +194,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 "9b52030bfcd7e90e3e550231a3783ad1982fda78"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "147xbbcza5q4wcdipk5jplajzkc48971kg2s7qv5jlz33sxkw1lq")))) + "0s9fjxpxxvj1xgzg3sfw6079blgmdvbb5cy6wb921sqaqwf52j6x")))) (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 "0971b69ca90f1697ef81276d9820dcd6d26de4ac"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) + "0ihbh1ajns0sf42h9992hnawwjr1n439sgb0g4zirn2bj5i1zbdv")))) (define lib-tl-for-telegram-desktop (origin @@ -224,52 +230,52 @@ (define lib-ui-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "37531086ec21a8569deddedb11b402f8a3157b90"))) + (commit "e9fb40c0d3ef6f05bfef0f4395c8b2d81bc9823a"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0")))) + "1if01nrxy785130cgbqjl8c99yylzsd4q7vv2x0px2nm56vy67lf")))) (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "b68a95ad4d1ae9a1827671100a7fd76cbe448c3f"))) + (commit "f701713cd798bd7d5f69d318fdefb125d101aa76"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1c8jwdnn26n13yp0rp0l71q6xlxa6wp3cspbm3pnghw964jwgp3z")))) + "1hki5lc2jrack0r7wyixfh3c08jnmnw3pfrggrznvj4kq490z1b4")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "f632fc84cbc62ae8abbbd05f81d472757a337c11"))) + (commit "659b9181240aae16c05ef8ab7e6c4dd527afcf8a"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i")))) + "1hg8jnpkszf3rrbnkqq9xc3n743602vkjp4kj8rccw7syjmgvrf1")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "2e2797648aac2588e7fe479c2e8b4455ec65c5e6"))) + (commit "b9fa8b84d8abe741183f157218ac038c596a54a5"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) + "1swni7xw5l0q376b6rnf9h93arzjqm9rkv7g6hz67742lf9a0x9z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") - (revision "389")) + (let ((commit "c9cc4390ab951f2cbc103ff783a11f398b27660b") + (revision "399")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -285,7 +291,7 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) + (base32 "0x2hjliiapb9kacbg8fwkz7g09c9k8dc77xxycjh5kmm1fc2i6dd")) (patches (search-patches ;; https://github.com/desktop-app/tg_owt/pull/123 @@ -400,6 +406,32 @@ (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 "23b0d70f9709da9b38561d5706891a134d18df76"))) + (file-name + (git-file-name "libprisma-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) + +;; telegram-desktop requires xdg-desktop-portal 1.18 to build, which isn't +;; available in Guix yet. +(define xdg-desktop-portal-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/flatpak/xdg-desktop-portal.git") + (commit "fa8d41a2f9a5d30a1e41568b6fb53b046dce14dc"))) + (file-name + (git-file-name "xdg-desktop-portal-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "1hgbpr5x20g63gklrkx2rrarpfsxfy2cpcs3sy2f7z39nlm4ipix")))) + (define-public telegram-desktop (package (name "telegram-desktop") @@ -415,7 +447,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) + (base32 "17cbx727m46v1w6lh2mh6vj5zkn9914lhn9p3bkp516v2zfisn40")) (patches (search-patches ;; https://github.com/telegramdesktop/tdesktop/pull/24126 @@ -481,7 +513,14 @@ (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/tgcalls" #$tgcalls-for-telegram-desktop))))) + ("Telegram/ThirdParty/libprisma" #$libprisma-for-telegram-desktop) + ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop) + ("Telegram/ThirdParty/xdg-desktop-portal" #$xdg-desktop-portal-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 @@ -494,13 +533,17 @@ (define-public telegram-desktop (inputs (list abseil-cpp-cxxstd17 alsa-lib + boost c++-gsl crc32c + cppgir + expected-lite fcitx-qt5 fcitx5-qt ffmpeg glib glibmm-2.76 + gobject-introspection gtk+ hime hunspell -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 02 05:59:32 2024 Received: (at control) by debbugs.gnu.org; 2 Jul 2024 09:59:33 +0000 Received: from localhost ([127.0.0.1]:35954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOaIO-0003X4-Ms for submit@debbugs.gnu.org; Tue, 02 Jul 2024 05:59:32 -0400 Received: from fhigh3-smtp.messagingengine.com ([103.168.172.154]:39875) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOaIL-0003Wq-Pn for control@debbugs.gnu.org; Tue, 02 Jul 2024 05:59:31 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 30CFE114031F for ; Tue, 2 Jul 2024 05:59:23 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Tue, 02 Jul 2024 05:59:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm3; t=1719914363; x=1720000763; bh=QYphA+aPSM 7PrLWeNrTKbQ45zuyZMtvJQnP0bTCGueo=; b=dM+iEn2L2YN1AhxzIoEEILsaZq 6PRRURFFdJMQEJ6HkzgZkPSqwNSa53jxXF5bNN4U/qCrrN4DOGOSjviV0URgmdaW nP0ed6Gj0EH5C7m5RQ2RqAsQtD1GR2LYRsZJ7CcE29mpSN7SuPoDYqn4aEftBiha VwrB6dAGg3pSXFr9rvJ6kft/x0Ugpx1Go8+jHwrzLCpXlxgMuovehB2H9zAZ3NTP mw2mMTqNg5McEFbxiSb5x3xg6Seosce6AYSpavOiB4fDsGoMYXm0OxR9ZMOZ/8+O FK3GARiVzmdovdq8bXWXNkW3BOkkGkxKE7czQOoIapfXff1mr5B/aCEB1gYw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1719914363; x=1720000763; bh=QYphA+aPSM7PrLWeNrTKbQ45zuyZ MtvJQnP0bTCGueo=; b=SzspMFnjdMz4Y3NoK4dWxG/n9mFf7WQpkRRPUOHlPg/y Tniv5viSU8alNDlrIg06pTyapJ2pBpDdZ7JHWfVNdlXqYYSwWpi/MsATlVsnd8pJ dpKxspdLdaf7Idie58tilO2HwC54P3rOtGz7TO64diNh/eB5uweBNSWZNHi+3bfu t47QGXTdFrFMYVlsHj6yC+0wMQvAQeHRDMaQtWUyFQRs/rcAkkHrGaoCoOvO9E+N xDNhQzaOkVVi50P4UTdzEkcPgnaXLz30QnTJtuMbdcTTIx9lXSuHqx6RrxviCrWE e07pVO4GQuoBgxxKISACCDPhZFcTVIDisJ8z4NStSw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudehgddvudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffkufggtgfgsehtjeertddttd ejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghr nhephfdvveeftdehueejueduveegteektedvleeutedvgfevueffueevffehgefhkeeune cuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggr nhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 2 Jul 2024 05:59:21 -0400 (EDT) Date: Tue, 2 Jul 2024 17:59:13 +0800 (GMT+08:00) From: dan To: control@debbugs.gnu.org Message-ID: <0493ae73-6b72-4070-b538-95ed2a6e78c4@dan.games> Subject: retitle 71897 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Correlation-ID: <0493ae73-6b72-4070-b538-95ed2a6e78c4@dan.games> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) retitle 71897 [PATCH 0/2] gnu: telegram-desktop: Update to 5.1.7. quit From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 02 07:10:30 2024 Received: (at 71897) by debbugs.gnu.org; 2 Jul 2024 11:10:30 +0000 Received: from localhost ([127.0.0.1]:36087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sObP3-0002aN-Qt for submit@debbugs.gnu.org; Tue, 02 Jul 2024 07:10:30 -0400 Received: from mail-qt1-f169.google.com ([209.85.160.169]:59783) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sObP0-0002a5-RI for 71897@debbugs.gnu.org; Tue, 02 Jul 2024 07:10:28 -0400 Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-4466327f401so12998501cf.3 for <71897@debbugs.gnu.org>; Tue, 02 Jul 2024 04:10:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719918560; x=1720523360; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=weOtVvTLlGE170cNNG56hGpyKCvq1JYq00evX7kwb50=; b=UQgR+6SAgugX8F8BWbns7D+OYP6A8jte2DKwLRqQsS8hRsYCO3SNl25xLiejtSwGP9 CekpzU9A5KzMX4FKxZbSv39PFU5W+a4LIvDWqD3o4wB/kp1Xkm0KHDBBph8j3/+AhFPV qx/cyDduo6rJCjWVErt+/Rl20ppMYtT2vvInBknaqGshwfktjqbGftkiHuHAkDZD+lkr JKpj/QWD1bSTY9mvqTHW31T0BG3D7p3fAW/E7mhuZzKqbY9n/AL9TyB5DVNa6jMftTdg bl2RUHnD+HfUoCs0rutbCe+sXl52f9t7pNoRmCiTsInR/hOtu7DCiq0bJ99yZ/QA4iO5 kcQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719918560; x=1720523360; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=weOtVvTLlGE170cNNG56hGpyKCvq1JYq00evX7kwb50=; b=xFA+gsnjbbtUHeJYgUCkuuNg7bxZGcfwKu0jPtp4Ash9aV2o/Ndf527acuafEa4Xcs d8JaZ/iwqa8N3sH35aAjV+vDRQfyzr4X8hM4zE0OYEsq+Xc5QooIaxYPkSuuESVFERpW iLUCXFEI6ayjleJNBLmAubB+BQgbPYfgJZqhiglkyNhsQELprGrb3hENrE3cYfia4Jrn cZA29S37hwpGAGDAd20NeTIR67CI9h/5xbvgbocVqcooJaso3JcGx4CZYx0kZ+THMK4E 8ZYWeAcLDHUqgwxmorCzVqwu6+qMEqwuFahEVtYIE4NMn9Ov+WcLojDaCjhkcFu5KFc8 nhXw== X-Gm-Message-State: AOJu0YwRJI94IiMrj2SL/OSHFPoPy89q6VwhlMKGMjvnHCaneg77ehYy 0oS0whyUznU4oifjn8oSRyD09tUct0Mg6f0uiNvC47ld86eW+VSF X-Google-Smtp-Source: AGHT+IEUjfbWabmlIhA+e82UqgAu5+mqlxVfrDUc9c6NhlIjtpjSajystRoYEht0/8lG7ZyiKoWMFw== X-Received: by 2002:a05:622a:1343:b0:444:fe2a:da5 with SMTP id d75a77b69052e-44662e58daamr95332121cf.59.1719918559811; Tue, 02 Jul 2024 04:09:19 -0700 (PDT) Received: from hurd (dsl-159-108.b2b2c.ca. [66.158.159.108]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-446513d4450sm39565721cf.12.2024.07.02.04.09.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 04:09:19 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH 1/2] gnu: Add cppgir. In-Reply-To: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@dan.games> (dan's message of "Tue, 2 Jul 2024 13:18:27 +0800") References: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@dan.games> Date: Tue, 02 Jul 2024 07:09:17 -0400 Message-ID: <87cynw59uq.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Vivien Kraus , Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Dan, dan writes: > * gnu/packages/glib.scm: Import (gnu packages pretty-print). > (cppgir): New variable. > > Change-Id: Ifaf3af1642bb8cb4750ee4f679967fb57c9cc7e2 > --- > gnu/packages/glib.scm | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm > index b11046f05d..10d39e4fe2 100644 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -20,6 +20,7 @@ > ;;; Copyright =C2=A9 2022 Petr Hodina > ;;; Copyright =C2=A9 2023 Saku Laesvuori > ;;; Copyright =C2=A9 2024 Zheng Junjie <873216071@qq.com> > +;;; Copyright =C2=A9 2024 dan > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -71,6 +72,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) > @@ -1594,3 +1596,31 @@ (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 > + (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") > + (revision "0")) When not using a release (tag or archive), a comment is nice to have, e.g. "No proper release; use the latest available tag." > + (package > + (name "cppgir") > + (version (git-version "2.0" revision commit)) > + (source (origin > + (method git-fetch) > + (uri > + (git-reference > + (url "https://gitlab.com/mnauw/cppgir") > + (commit commit))) > + (sha256 > + (base32 "1fa9nf4yljfarihaqj5kd98yysrky7q316mh6l5b1rq39g= a15k9b")))) > + (build-system cmake-build-system) > + (arguments > + (list > + #:configure-flags #~(list "-DINTERNAL_EXPECTED=3DOFF"))) > + (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-Introsp= ection > +annotations into a set of C++ files defining suitable namespaces, classe= s and > +other types that together from a C++ binding. In this way, the plain C ^ form ? =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20 > +libraries and objects become available as native objects along with (RAI= I) use @acronym for RAII, defining what it means. > +managed resource handling.") > + (license license:expat)))) The description that should start with proper punctuation (a capital letter), and the use of two spaces for separating sentences (a Texinfo/Guile convention). I believe 'guix lint' should warn about the later at least. Could you send a v2 including these mostly cosmetic changes? --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 02 09:17:51 2024 Received: (at 71897) by debbugs.gnu.org; 2 Jul 2024 13:17:51 +0000 Received: from localhost ([127.0.0.1]:36264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOdOI-0000GE-Tw for submit@debbugs.gnu.org; Tue, 02 Jul 2024 09:17:51 -0400 Received: from fout1-smtp.messagingengine.com ([103.168.172.144]:47425) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOdOE-0000Fo-PF for 71897@debbugs.gnu.org; Tue, 02 Jul 2024 09:17:49 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfout.nyi.internal (Postfix) with ESMTP id 7EBA81380242 for <71897@debbugs.gnu.org>; Tue, 2 Jul 2024 09:17:39 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 02 Jul 2024 09:17:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm3; t=1719926259; x=1720012659; bh=UHQktq6t5x gJQV8H3tw3WpQchIcDBfM/fZ61W9RaGCQ=; b=KKP4N693zli1cGX9LSkxK1Iy35 f6iAGd+VNgYL9dxhhvf2H6EQU3+JxZTRVPyuu7k7d/Lp4PFG8WkpQoGXE5o9Rc+w dFW8kG0aIbAJFyQFVdZb2wQWifHC1n0JcuRHUuMwYs8tD+dzBu7uxYroh6+aIe6C JDXoSfBnl1xMRUYp/+2CD8WNqXCMGBh0ANPIbVTfgCOojtzsAHixiyJJiSGNJg8x PWbiriEPyKo+OqfUqbu8WuUwQ6v6zVkl2fzqtTe1LF/BTXdmOIhNctMBIMUs5/Um xnOP0G/UWBJMk/zYce/r3i2/kAm41NW0Zt59nzdSwIlWVSWaGyzTEjkbL96Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1719926259; x=1720012659; bh=UHQktq6t5xgJQV8H3tw3WpQchIcD BfM/fZ61W9RaGCQ=; b=dTlV9RHGGwX+KakZrEkx78SoQA0kKmKf/BwysmrnlRPo +KRlqlf5mpF0cJfzzb8DbiiZNLXxiWqn+Tm65XnkmcjoJWLl+c/2EYu+p0E/aq1G lUibLP8v/8EJYp3zfzoR8R0Dw8sR2ceRQqFdLkpEgMWnMj9y7+WGXov4YypTH3E9 lbINDWmaMxmSRQlg/6II2iG1+dUDCQwcrdgF6SLon2FC5HKFUl1lUmOplJVmqHtK XmAcqF66feAx1c+GXd3iWBTeODKMI8gSweuHG4kA+PZ++2vlDHsXnIDFViTtXI9i wXh3QigFcyamC2a8wAMOY8/u5LdZRhcfcPWyRNhV6Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudehgdeitdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekredtre dtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgv rhhnpeelveelhfetheeuiedthfdvteelledvhffflefhkeffheekvdehffeigeektefgje enucffohhmrghinhepghhithhlrggsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Tue, 2 Jul 2024 09:17:38 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH 1/3] gnu: Add cppgir. Date: Tue, 2 Jul 2024 21:17:14 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/glib.scm: (cppgir): New variable. Change-Id: Ifaf3af1642bb8cb4750ee4f679967fb57c9cc7e2 --- gnu/packages/glib.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b11046f05d..77279e6ad0 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Saku Laesvuori ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,6 +72,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) @@ -1594,3 +1596,35 @@ (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+))) + +;; This package is added as a dependency of telegram-desktop. The 2.0 version +;; failed to compile, so we use the commit specified in telegram-desktop. +(define-public cppgir + (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") + (revision "0")) + (package + (name "cppgir") + (version (git-version "2.0" revision commit)) + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fa9nf4yljfarihaqj5kd98yysrky7q316mh6l5b1rq39ga15k9b")))) + (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 "GObject introspection C++ binding wrapper generator") + (description "cppgir processes .gir files derived from GObject +introspection annotations into a set of C++ files defining suitable +namespaces, classes and other types that together form a C++ binding. In this +way, the plain C libraries and objects become available as native objects +along with @acronym{RAII, Resource Acquisition Is Initialization} managed +resource handling.") + (license license:expat)))) base-commit: 4b3a553ca5ba5ac190739309eb5f7aa8170cf2a8 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 02 09:17:52 2024 Received: (at 71897) by debbugs.gnu.org; 2 Jul 2024 13:17:52 +0000 Received: from localhost ([127.0.0.1]:36268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOdOJ-0000GH-Hw for submit@debbugs.gnu.org; Tue, 02 Jul 2024 09:17:52 -0400 Received: from fhigh5-smtp.messagingengine.com ([103.168.172.156]:54699) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOdOG-0000Fu-FP for 71897@debbugs.gnu.org; Tue, 02 Jul 2024 09:17:49 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 254951140264 for <71897@debbugs.gnu.org>; Tue, 2 Jul 2024 09:17:42 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 02 Jul 2024 09:17:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1719926262; x=1720012662; bh=cq/k55gjCarnRpO2StTDUCH/By46JoT/7wKUMxObkcM=; b= aZxMAWKBSWviyPWa1pQ48zYkTHpxVgEzGibDV573apa9P0/r28Ifp+oWV4XKXv7t 6Y2PzO1L+2P5Qzg4SQtGv9cMdA0TF3GO+NUihFWAAmchLlejtdeFhwc7vqgdTuK7 lCm2iYovnnmZAp9XBijVi+m+sHU2EkAUPmt5g4vRsEFo9wSF+f61I7fxuqgrvMuz EE5Em3wBaK9/BVBMSP4u/G/yNA6q1StI6M1jW9gpdD0+bso/crZmztWTJleRjD+f ksKCOluprsKgJ3+1xWToeq2yZdhbihXEzxxaFzif+KTXH9HqUZdgJTNmKrOUYrBn caiRb/lzjJysuoP9GMHKaw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1719926262; x= 1720012662; bh=cq/k55gjCarnRpO2StTDUCH/By46JoT/7wKUMxObkcM=; b=c VD3Ibww6bTTDIraSMpjK7h9PZrlCI2+iqmVkLfKvmf2yi3UE564ixVNlwGqigkRS Lc/Vgktw+Kro9BHp03Us4lCGJo6T061R94ZdjaTXorhZTEIyufwYSpAMqTFfeKQI ypiccc/3zwrNlSzjljUpSoZzzF2bRQgBtu+bxHBgMIgNZY1TOlUqJu4O4w7zw9Qd Wjj/Spnm2HURZKYA5m98j9MD7dZwVGAFDe3eitBe/FUYETVO7mK+ZnmYC3AjX8+C tScKHEg9q2pUhtTyln3PHIeu9Zk1XA5yUhdPTQayqUKzW0chjQvW/0atLdtltD0P vsZI6ESorxolJHfvM6GZA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudehgdeitdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesthekre dtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrght thgvrhhnpeehfeekffeiffekueehvdffjeeuvdejleektdeiueelhedtudegieefueeile eggfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehi segurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Tue, 2 Jul 2024 09:17:41 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH 2/3] gnu: xdg-desktop-portal: Update to 1.18.4. Date: Tue, 2 Jul 2024 21:17:15 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.18.4. [patches]: Disable portal tests. [native-inputs]: Remove autoconf, automake, libtool and which. Add python, python-dbusmock, python-pytest and python-pytest-xdist. [inputs]: Add bubblewrap. [phases]<#:configureflags>: Update flags to meson options. Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 25 +++++---- ...-desktop-portal-disable-portal-tests.patch | 56 +++++++++++++++++++ 3 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index cf6b1d61b3..973c4a5dad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2240,6 +2240,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-dbus-group-policy.patch \ %D%/packages/patches/x265-arm-flags.patch \ + %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xen-docs-use-predictable-ordering.patch \ %D%/packages/patches/xen-remove-config.gz-timestamp.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6941450436..2015ee46f8 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2022 Samuel Culpepper ;;; Copyright © 2024 aurtzy ;;; Copyright © 2024 Dariqq +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -133,6 +134,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages video) + #:use-module (gnu packages virtualization) #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -2989,7 +2991,7 @@ (define-public libportal (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.16.0") + (version "1.18.4") (source (origin (method url-fetch) @@ -2998,18 +3000,21 @@ (define-public xdg-desktop-portal version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav")))) - (build-system gnu-build-system) + "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q")) + ;; disable portal tests since they try to use fuse + (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("glib:bin" ,glib "bin") - ("which" ,which) - ("gettext" ,gettext-minimal))) + ("gettext" ,gettext-minimal) + ("python" ,python) + ("python-dbusmock" ,python-dbusmock) + ("python-pytest" ,python-pytest) + ("python-pytest-xdist" ,python-pytest-xdist))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) + `(("bubblewrap" ,bubblewrap) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("flatpak" ,flatpak) ("fontconfig" ,fontconfig) @@ -3021,7 +3026,7 @@ (define-public xdg-desktop-portal ("fuse" ,fuse))) (arguments `(#:configure-flags - (list "--with-systemd=no") + (list "-Dsystemd=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'po-chmod diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch new file mode 100644 index 0000000000..5e13493613 --- /dev/null +++ b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch @@ -0,0 +1,56 @@ +From b7750fa99c31c5f28ac2053fa154bef4038b5cc0 Mon Sep 17 00:00:00 2001 +From: dan +Date: Tue, 2 Jul 2024 19:37:38 +0800 +Subject: [PATCH] tests: remove portal tests. + +--- + tests/meson.build | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index a2dafee..bcd87be 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -181,18 +181,6 @@ portal_tests = [ + + test_env = env_tests + test_env.set('XDG_CURRENT_DESKTOP', 'test') +-foreach p : portal_tests +- test( +- 'test-portals-@0@'.format(p), +- test_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/portal/@0@'.format(p)], +- depends: [test_backends, test_portals], +- env: test_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + # Split the portal tests into one test per portal, this makes debugging a lot + # easier. +@@ -204,18 +192,6 @@ portal_limited = [ + + limited_env = env_tests + limited_env.set('XDG_CURRENT_DESKTOP', 'limited') +-foreach p : portal_limited +- test( +- 'limited-portals-@0@'.format(p), +- limited_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/limited/@0@'.format(p)], +- depends: [test_backends, limited_portals], +- env: limited_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + if enable_installed_tests + install_data( + +base-commit: 11c8a96b147aeae70e3f770313f93b367d53fedd +-- +2.41.0 + -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 02 09:17:55 2024 Received: (at 71897) by debbugs.gnu.org; 2 Jul 2024 13:17:55 +0000 Received: from localhost ([127.0.0.1]:36270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOdOM-0000Gg-EB for submit@debbugs.gnu.org; Tue, 02 Jul 2024 09:17:55 -0400 Received: from fhigh5-smtp.messagingengine.com ([103.168.172.156]:48729) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOdOJ-0000Fx-Cz for 71897@debbugs.gnu.org; Tue, 02 Jul 2024 09:17:53 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 1C8A0114023A for <71897@debbugs.gnu.org>; Tue, 2 Jul 2024 09:17:45 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Tue, 02 Jul 2024 09:17:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1719926265; x=1720012665; bh=80+a1QoCpmYi2rd6n1Kv6TkC7RZ0XGyjiX/jPApjiik=; b= Saijnxwo5+oCcuc4RAX50jlO7vn+R7FdNTRN7R/2+NHRjlrXAJqDrvjCZ7M89HIB PfjP+xTq8ChxmytDxyfnaXzR2XU++eAUI9EiBCR/jvZfA4yd5QUGZOd5YcIeYEnJ tpZyAZ1mAHOl5In0TBlgSoaMkhzLtp4iDl0YmnpxqpzWuL82fYbYHjXCbZADk0I2 k9qIVBHL8CK7jBdY+0SE0OLbf/3UDizuF2hKxZLn3c3YfM1njDpQoTdiVIA8DkR8 2wEH+Do+hY60F6sesUcYJGuPdpmdMQSOpLJjVkyqy+3c4nYX0lKV76fO5Y2wHZ7a A/15jXWFR5FuKc7ChABiXg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1719926265; x= 1720012665; bh=80+a1QoCpmYi2rd6n1Kv6TkC7RZ0XGyjiX/jPApjiik=; b=Z c3b3o96oRKHFEXx1ltxfOu81ZBj2n5xPXDlMRgc097KKN2Sbb2dU6fO2LGIUhp5e gacakTw9WAlxwkVViRitVpgX48KZYq7MWR521epl7KVh8x0mUNpT4L3M9ibohhzI 6jFri2jEV+1PVZF6R3115TO/YS1qtE5AS8Fp+rbaEdIdLl4+BzLO4yDFoK0ta/Sf 8LNLrjnkhJSIIJ4FNQGvJUPw+BihgWRK4RUvqNdPs6bY/fw70j7o1ea02fsd8Vw2 wk7P2Jd3hbbDPEH5AqoBuu4LS86hHJvtSsb3q29Lp+FaV+Avszfk98cz9yZM1A2F DLj/1ImKYaOzDsbFZwJjA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudehgdeitdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecufghrlhcuvffnffculdduvddmnecujfgurhephffvuf ffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhg rghmvghsqeenucggtffrrghtthgvrhhnpeeikeeuvddtveelgeehudehleehteffhffhff fhvdevgeevkeehhfffieeuieegieenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhk ihhtfigrrhgvrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Tue, 2 Jul 2024 09:17:43 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH 3/3] gnu: telegram-desktop: Update to 5.2.1. Date: Tue, 2 Jul 2024 21:17:16 +0800 Message-ID: <055c995fc8635cfec0b73238e4632df1188c21dd.1719926171.git.i@dan.games> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. * gnu/local.mk (dist_patch_DATA): register them. * gnu/packages/telegram.scm: (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)[origin]: Add patches to unbundle gsl and cppgir. (libprisma-for-telegram-desktop): New variables. (telegram-desktop): Update to 5.2.1. [arguments]<#:phases>: Add libprisma-for-telegram-desktop. : New phase. : New phase. [inputs]: Add boost, cppgir, expected-lite and gobject-introspection. Change-Id: I75441a6284e3755f510a7d3ba5746bfbb8acbb91 --- gnu/local.mk | 2 + .../telegram-desktop-unbundle-cppgir.patch | 95 ++++++++++++++++++ .../telegram-desktop-unbundle-gsl.patch | 31 ++++++ gnu/packages/telegram.scm | 99 +++++++++++++------ 4 files changed, 196 insertions(+), 31 deletions(-) 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 973c4a5dad..2d4f866491 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2135,6 +2135,8 @@ 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-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-unbundle-cppgir.patch b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch new file mode 100644 index 0000000000..a24dbe25bb --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch @@ -0,0 +1,95 @@ +From a5c42e07ae223d440ff11347e0cf1fd58fd383df Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 1/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/CMakeLists.txt | 4 +++- + external/glib/generate_cppgir.cmake | 7 ++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt +index 3c6fe4be..c862705f 100644 +--- a/external/glib/CMakeLists.txt ++++ b/external/glib/CMakeLists.txt +@@ -13,9 +13,11 @@ function(add_cppgir) # isolate scope + set(BUILD_EXAMPLES OFF) + add_subdirectory(cppgir EXCLUDE_FROM_ALL) + endfunction() +-add_cppgir() + + include(generate_cppgir.cmake) ++if (NOT CppGir_FOUND) ++ add_cppgir() ++endif() + generate_cppgir(external_glib Gio-2.0) + + find_package(PkgConfig REQUIRED) +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index c15d3f9e..9b0a5ac8 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 2.0) ++ + function(generate_cppgir target_name gir) + set(cppgir_loc ${cmake_helpers_loc}/external/glib/cppgir) + +@@ -17,6 +19,9 @@ function(generate_cppgir target_name gir) + ${cppgir_loc}/data/cppgir.ignore + ${cppgir_loc}/data/cppgir_unix.ignore + ) ++ if (CppGir_FOUND) ++ set(ignore_files) # rely on default ignore list ++ endif() + + set(gir_path) + if (IS_ABSOLUTE "${gir}") +@@ -33,7 +38,7 @@ function(generate_cppgir target_name gir) + --class + --class-full + --expected +- --ignore ++ "$<$:--ignore>" + "$" + --output + ${gen_dst} + +From eed39522952c15f448c54290454806dd011c4996 Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 2/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/generate_cppgir.cmake | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index 9b0a5ac8..2ad82277 100644 +--- a/external/glib/generate_cppgir.cmake ++++ b/external/glib/generate_cppgir.cmake +@@ -15,11 +15,12 @@ function(generate_cppgir target_name gir) + + set(gen_timestamp ${gen_dst}/${target_name}_cppgir.timestamp) + +- set(ignore_files +- ${cppgir_loc}/data/cppgir.ignore +- ${cppgir_loc}/data/cppgir_unix.ignore +- ) +- if (CppGir_FOUND) ++ if (NOT CppGir_FOUND) ++ set(ignore_files ++ ${cppgir_loc}/data/cppgir.ignore ++ ${cppgir_loc}/data/cppgir_unix.ignore ++ ) ++ else() + set(ignore_files) # rely on default ignore list + endif() + 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..f89d326a5c --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch @@ -0,0 +1,31 @@ +From a3ac6df0441b4caca28b1df87febc420e18942ce Mon Sep 17 00:00:00 2001 +From: Zephyr Lykos +Date: Mon, 23 Oct 2023 15:55:24 +0800 +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 8eaf19c5..344f9488 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) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 358374a5bb..54b9c72361 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2023 Lu Hui ;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; Copyright © 2024 Ricardo Wurmus +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,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) @@ -82,11 +84,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 "5.2.1") (define libyuv-for-telegram-desktop - (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") - (revision "2439")) + (let ((commit "04821d1e7d60845525e8db55c7bcd41ef5be9406") + (revision "2440")) (origin (method git-fetch) (uri (git-reference @@ -97,67 +99,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 "5742caae65e4163e7faec238eb4e3e5c219ad09c"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) + (patches + ;; https://github.com/desktop-app/cmake_helpers/pull/320 + ;; https://github.com/desktop-app/cmake_helpers/pull/305 + (search-patches "telegram-desktop-unbundle-gsl.patch" + "telegram-desktop-unbundle-cppgir.patch")) (sha256 (base32 - "0y96mvzs113zh8bdw1h3i6l0pgwg93rigrday8kfdg4magz686k6")))) + "1ld74wd4gyx22gd132ci13sbzis7ypxqiyk4y0mrlhjvmciq9nw1")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "1a969faa0afb29d53af03e530775eccdfb8433f1"))) + (commit "0af136124083369073b8fdaf45f0816fd2b10bad"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1xmw8dfm51p5g20rlmzqnr72a14ngyxwq09an8clf1v5s6mmwvak")))) + "057bwn9smrgnyfb1vraf50ihbkhjc4d72msl7vnbqc4h5sg8dav9")))) (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 "f30400147d997fedc787e214467d305db6c159e7"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83")))) + "0mm88xj9q9v5p0z7byjfpbmw8h6rqg9ya9m0jhfzi2s8iglz0cga")))) (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 @@ -188,24 +195,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 "0b7622ff38778e9cd03d3997de59351973480a1f"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "147xbbcza5q4wcdipk5jplajzkc48971kg2s7qv5jlz33sxkw1lq")))) + "0s9fjxpxxvj1xgzg3sfw6079blgmdvbb5cy6wb921sqaqwf52j6x")))) (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 "0971b69ca90f1697ef81276d9820dcd6d26de4ac"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) + "0ihbh1ajns0sf42h9992hnawwjr1n439sgb0g4zirn2bj5i1zbdv")))) (define lib-tl-for-telegram-desktop (origin @@ -224,52 +231,52 @@ (define lib-ui-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "37531086ec21a8569deddedb11b402f8a3157b90"))) + (commit "ebd8609ee73d48186b905787dd5bb3bcbb4f9f3f"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0")))) + "0abpb0gi3k99pm5zh5gh9czhi48jqvr6wy0yli004hswlfqs2nxk")))) (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "b68a95ad4d1ae9a1827671100a7fd76cbe448c3f"))) + (commit "f701713cd798bd7d5f69d318fdefb125d101aa76"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1c8jwdnn26n13yp0rp0l71q6xlxa6wp3cspbm3pnghw964jwgp3z")))) + "1hki5lc2jrack0r7wyixfh3c08jnmnw3pfrggrznvj4kq490z1b4")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "f632fc84cbc62ae8abbbd05f81d472757a337c11"))) + (commit "659b9181240aae16c05ef8ab7e6c4dd527afcf8a"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i")))) + "1hg8jnpkszf3rrbnkqq9xc3n743602vkjp4kj8rccw7syjmgvrf1")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "2e2797648aac2588e7fe479c2e8b4455ec65c5e6"))) + (commit "b9fa8b84d8abe741183f157218ac038c596a54a5"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) + "1swni7xw5l0q376b6rnf9h93arzjqm9rkv7g6hz67742lf9a0x9z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") - (revision "389")) + (let ((commit "c9cc4390ab951f2cbc103ff783a11f398b27660b") + (revision "399")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -285,7 +292,7 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) + (base32 "0x2hjliiapb9kacbg8fwkz7g09c9k8dc77xxycjh5kmm1fc2i6dd")) (patches (search-patches ;; https://github.com/desktop-app/tg_owt/pull/123 @@ -400,6 +407,18 @@ (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 "23b0d70f9709da9b38561d5706891a134d18df76"))) + (file-name + (git-file-name "libprisma-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) + (define-public telegram-desktop (package (name "telegram-desktop") @@ -415,7 +434,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) + (base32 "0x5fjr0brl3x5d3d0jjkx0gsm297wl47bnwhy1zb4zndkwl0h28b")) (patches (search-patches ;; https://github.com/telegramdesktop/tdesktop/pull/24126 @@ -481,7 +500,20 @@ (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 'unpack-additional-sources 'use-system-xdg-desktop-portal + (lambda _ + (substitute* (list "Telegram/CMakeLists.txt" + "Telegram/lib_base/CMakeLists.txt") + (("\\$\\{third_party_loc\\}/xdg-desktop-portal/data") + (string-append #$(this-package-native-input "xdg-desktop-portal") + "/share/dbus-1/interfaces"))))) (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 @@ -490,17 +522,22 @@ (define-public telegram-desktop (list `(,glib "bin") `(,gtk+ "bin") pkg-config - python-wrapper)) + python-wrapper + xdg-desktop-portal)) (inputs (list abseil-cpp-cxxstd17 alsa-lib + boost c++-gsl crc32c + cppgir + expected-lite fcitx-qt5 fcitx5-qt ffmpeg glib glibmm-2.76 + gobject-introspection gtk+ hime hunspell -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 02 09:30:41 2024 Received: (at control) by debbugs.gnu.org; 2 Jul 2024 13:30:41 +0000 Received: from localhost ([127.0.0.1]:36296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOdaj-0000mE-LO for submit@debbugs.gnu.org; Tue, 02 Jul 2024 09:30:41 -0400 Received: from fhigh5-smtp.messagingengine.com ([103.168.172.156]:59061) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOdag-0000m0-SU for control@debbugs.gnu.org; Tue, 02 Jul 2024 09:30:40 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 50D0711402B0 for ; Tue, 2 Jul 2024 09:30:32 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Tue, 02 Jul 2024 09:30:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm3; t=1719927032; x=1720013432; bh=Dh8kdsY0q0 9ibZK6ziR/NVdW0Y3Bm/2qDER9l9IfQVg=; b=J505/tz+50KKkhFRQEacp62usr SHYqHflIEWiSDMq286N3I+R+XM4jmK5VNUT1pvsJYbh9w1d/u2+Arr0i+3S5HPnc tlz7vlMDLjXoxRpd1TfRw1J49IJcg7TaxLkPgUAiDopFQsav2euXd6UcNZc11tUJ m4jow9NsAb/YGPiP+OWCgOye3aOIoKeIriLxDny1V3RlMi3wGN36BecWpe1PcjmL XGP/R7Kf3JW40J0GCG1dSRjYhBkfk8dAc8PqZ1ed9ClGjW+FiaYpXb9ghc9puLhg c0ZfCRPhtvMZsXKeyFFxwwhnZkI5j6u2/DK5FqCdvXBCUROfcRnLZ0cxTamw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1719927032; x=1720013432; bh=Dh8kdsY0q09ibZK6ziR/NVdW0Y3B m/2qDER9l9IfQVg=; b=ElRn3qdOckLJWA4Tt40BxtALpmvpg0pO2vhzv5doRM0s 6N7ZTznN/mpF5TilJMpyEN594m0ACv9Z1/ydkqCNxrWgPnFF1w578iAQ5vP8P8GQ NhrxN9NOi2Ra9/xr4X0++ngWd54Je4lrrPq0o6VYL8lVy2IxxGZJaOx7x2887dSm 3WuRLzhgEpYWo41pwQuQBURz20qdPVCUH5ke8krKxKer7wSbqrfDd4MmRyKiNcku KCoYJ6XSHN87tN78a5bca2ts4xfbq+7l8l3Halmq/Nk1K8g5sP1JTiXs1Z2lbUyk rt01eGybfMZPi8R3A7r4mdGH59OKNRuEMClO+HvWcA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudehgdeifecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffkufggtgfgsehtjeertddttd ejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghr nhephfdvveeftdehueejueduveegteektedvleeutedvgfevueffueevffehgefhkeeune cuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggr nhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 2 Jul 2024 09:30:31 -0400 (EDT) Date: Tue, 2 Jul 2024 21:30:21 +0800 (GMT+08:00) From: dan To: control@debbugs.gnu.org Message-ID: <55de4a33-b0b1-4b2d-935a-dc4d09901ac6@dan.games> Subject: retitle 71897 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Correlation-ID: <55de4a33-b0b1-4b2d-935a-dc4d09901ac6@dan.games> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) retitle 71897 [PATCH 0/3] gnu: telegram-desktop: Update to 5.2.1. quit From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 02 12:59:35 2024 Received: (at 71897) by debbugs.gnu.org; 2 Jul 2024 16:59:35 +0000 Received: from localhost ([127.0.0.1]:37543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOgqt-00040k-9j for submit@debbugs.gnu.org; Tue, 02 Jul 2024 12:59:35 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:60548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOgqq-00040U-AV for 71897@debbugs.gnu.org; Tue, 02 Jul 2024 12:59:34 -0400 Received: by mail-ej1-f67.google.com with SMTP id a640c23a62f3a-a72459d8d6aso452910666b.0 for <71897@debbugs.gnu.org>; Tue, 02 Jul 2024 09:59:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719939505; x=1720544305; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=u/SR0gi4FE1DpP58CkaceBtBMleLyNdmeKOWipyPy6E=; b=I5tU/tSVOtq+CHZym6J3mkNfTi+cMsWe/OE9DjwP0IAxg/Vy0iOEkV928uxtkcjaeL QNEEcvxG1tdCt6rcvXeMTubWx3PEbdcMdFBGHgaJi2iR7MZCR1DpbdTrnSKfMrebNydi 8Tj2LSF/Sc7ActaIREta7ruPyXKDjKTcSmtBjHiJLwwU/raeM8ZCFcXhaoOcwjth4Wrh S7R31uHh6ULxuWHyFysstp8IIU0DZZZ2yC+iCH3ZQtjb9n5bezuUfB/tqrPJ0k+QxhqM MwsTUnSB6FtC5xi2DjiR0JbYjRPy0e4zc8/SAhm0jJ77IJ5hhorODCd1QmV5Pux/frmA 2quQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719939505; x=1720544305; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=u/SR0gi4FE1DpP58CkaceBtBMleLyNdmeKOWipyPy6E=; b=s/yWDWuCEsmDFoHwRCDdeUEhqYd5jIjbzfsmWapL+GZTJlP4ulw2+tgOVMoM1TEccU 7/si58K2A9x41GVQ76uUCWAx07+WPh4i1EeGHam8QdmNdcdA9CF6eBVkgGUzWdeASa0b LvcTyLcrBVhRS/KahhRnazZB9l+F6LNqzLJDhw8YyCrrLew5FdHJdn1vVBTt4A/HDLn3 sArMnMyxOwJSwct/ME9QkNrHSgTjPhz9EoktF2bGjHbPMLaJmmUPlPdB+fZq0iGp/ihA d1BaiXT5a0HfhpGInjNxdZ/OyFyw7sv01F5dSUK1cBECzS/A4kUTPTRaYI2A5jCpY9jU Al1Q== X-Forwarded-Encrypted: i=1; AJvYcCVYaO5004ZOpGvaNs6hWcuwz3H7Kc2g0B3Tw+SO3r/W4J0kDIHB3ppGB7xMy+EQcgGYvuxc3uxi+d6ojaSctLBV00bwNTQ= X-Gm-Message-State: AOJu0Yy9F089WDezCVfnyFtjl66yKCF2zxBfHKD/Q9JYgJWGOyLznjgz 9OPuSFPdIGvydGRLhlDvGNWyuwg0sktCQg4CklBJAA9k/z+xfHRa X-Google-Smtp-Source: AGHT+IH7/Iz7vksIifrUf/M9B1D6ZHProFbJJpdUD37JEmNjlzQx65AA+qwaaa8XWDVoKpSbjslOYw== X-Received: by 2002:a17:907:7ea1:b0:a72:6375:5fc4 with SMTP id a640c23a62f3a-a751441a633mr757512166b.11.1719939504690; Tue, 02 Jul 2024 09:58:24 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72aaf18a14sm435385866b.25.2024.07.02.09.58.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 09:58:24 -0700 (PDT) Message-ID: <422033ee898fc199e8930dc3b6486f96175e91be.camel@gmail.com> Subject: Re: [bug#71897] [PATCH 1/3] gnu: Add cppgir. From: Liliana Marie Prikler To: dan , 71897@debbugs.gnu.org Date: Tue, 02 Jul 2024 18:58:22 +0200 In-Reply-To: References: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@dan.games> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Vivien Kraus , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 02.07.2024 um 21:17 +0800 schrieb dan: > * gnu/packages/glib.scm: (cppgir): New variable. >=20 > Change-Id: Ifaf3af1642bb8cb4750ee4f679967fb57c9cc7e2 > --- > =C2=A0gnu/packages/glib.scm | 34 ++++++++++++++++++++++++++++++++++ > =C2=A01 file changed, 34 insertions(+) >=20 > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm > index b11046f05d..77279e6ad0 100644 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -20,6 +20,7 @@ > =C2=A0;;; Copyright =C2=A9 2022 Petr Hodina > =C2=A0;;; Copyright =C2=A9 2023 Saku Laesvuori > =C2=A0;;; Copyright =C2=A9 2024 Zheng Junjie <873216071@qq.com> > +;;; Copyright =C2=A9 2024 dan > =C2=A0;;; > =C2=A0;;; This file is part of GNU Guix. > =C2=A0;;; > @@ -71,6 +72,7 @@ (define-module (gnu packages glib) > =C2=A0=C2=A0 #:use-module (gnu packages perl-check) > =C2=A0=C2=A0 #:use-module (gnu packages popt) > =C2=A0=C2=A0 #:use-module (gnu packages pkg-config) > +=C2=A0 #:use-module (gnu packages pretty-print) > =C2=A0=C2=A0 #:use-module (gnu packages python) > =C2=A0=C2=A0 #:use-module (gnu packages python-xyz) > =C2=A0=C2=A0 #:use-module (gnu packages sqlite) > @@ -1594,3 +1596,35 @@ (define-public libdex > =C2=A0Dex also provides Fibers which allow writing synchronous looking > code in C > =C2=A0that uses asynchronous and future-based APIs.") > =C2=A0=C2=A0=C2=A0=C2=A0 (license license:lgpl2.1+))) > + > +;; This package is added as a dependency of telegram-desktop.=C2=A0 The > 2.0 version > +;; failed to compile, so we use the commit specified in telegram- > desktop. > +(define-public cppgir > +=C2=A0 (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (revision "0")) > +=C2=A0=C2=A0=C2=A0 (package > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (name "cppgir") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (version (git-version "2.0" revision comm= it)) Can we investigate why 2.0 fails to compile? If telegram-desktop requires a newer one, that's fine, we'd just name it cppgir-for- telegram-desktop, as it's an application that likes to require special versions. > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (source (origin > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 (method git-fetch) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 (uri > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 (git-reference > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (url "https://gitlab.com/mnauw/cppgir") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (commit commit))) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 (file-name (git-file-name name version)) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 (sha256 > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 (base32 > "1fa9nf4yljfarihaqj5kd98yysrky7q316mh6l5b1rq39ga15k9b")))) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (build-system cmake-build-system) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (arguments > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (list > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #:configure-flags #~(list "-D= INTERNAL_EXPECTED=3DOFF"))) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (inputs (list boost fmt expected-lite)) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (home-page "https://gitlab.com/mnauw/cppg= ir") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (synopsis "GObject introspection C++ bind= ing wrapper > generator") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (description "cppgir processes .gir files= derived from GObject > +introspection annotations into a set of C++ files defining suitable > +namespaces, classes and other types that together form a C++ > binding.=C2=A0 In this > +way, the plain C libraries and objects become available as native > objects > +along with @acronym{RAII, Resource Acquisition Is Initialization} > managed > +resource handling.") I think "and resources are handled according to the @acronym{RAII, =E2=80= =A6} pattern." would fit nicer, grammatically. Cheers From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 03 09:23:13 2024 Received: (at 71897) by debbugs.gnu.org; 3 Jul 2024 13:23:13 +0000 Received: from localhost ([127.0.0.1]:39172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOzx2-0000cS-Uu for submit@debbugs.gnu.org; Wed, 03 Jul 2024 09:23:13 -0400 Received: from fout8-smtp.messagingengine.com ([103.168.172.151]:56395) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOzwz-0000br-Uj for 71897@debbugs.gnu.org; Wed, 03 Jul 2024 09:23:12 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.nyi.internal (Postfix) with ESMTP id A029213800FB for <71897@debbugs.gnu.org>; Wed, 3 Jul 2024 09:23:02 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 03 Jul 2024 09:23:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm3; t=1720012982; x=1720099382; bh=Ec85AUeKhS aRbs8YBxrFNE++ra1NA6eylNWE1NN5JUI=; b=DDTEJv7ZvbUZ/m8mBmVF3Uh51d QhXnx6E2IHqpm2kT3V2CeX0qjWXj6haHrj7dzlFVJ2rX4gRTmIUsu48a+U6Tp8sQ lWrguIqmvfe4Ny1XYxcRnrS23YcSr0Pk+FEA04eSNclGEXwUcWjPB/rWUIKIJfm2 AQONCIbNnDfZ63KJbDiTk/vrvdzcjvcMytOgJm5wCxAbQKLcaVyJJ2h2+1cN1ec7 uC7GCZbA8PJxjEyVwu+fAn3eYXyHrcOFRQpghH1/vqJb3TZA+mCpdCSpqMAXAYl1 a1p9LNzwcHPrzavtethxJD8Aba4utnNCOTHQPyPzlf+7CTfuGKDNAPiGJGXg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1720012982; x=1720099382; bh=Ec85AUeKhSaRbs8YBxrFNE++ra1N A6eylNWE1NN5JUI=; b=dT0AJnp5aLzowztupH3NjU8jC7qfgRk+ZhT98PWc9vHc qOG7vVSaKy/FJfCY59u/W5NRPpb59sPquuDmp9CyYwnadcGnY2p6mmGIH2oSKztr GiU1eZK7ONLuMd5mmQwpwqg1nP4LCsEXz3I68pNmo3/BTsG0B5WrwLPn+oBAOVsc 5vzw227RecxwrFSMmY2SgUnQRhmwZQo+1Pn+iRwfonzSUUa10XvibONJqkJeq+qg 91HuUvF0KfuH7SyotUYXNnS1mW55r0/cMaa8s7NIez5r++TmSLqKqrsONZsjNXxl ebO+N1bI5reSYdbmKdNnqTkW9nSl9WoZUHlHw6he1w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudejgdeifecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekredtre dtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgv rhhnpeegjeehgffggffgieehkedvkeevtefgjeetfedutdefvedttedutdefheehhfdthe enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegu rghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Wed, 3 Jul 2024 09:23:01 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v3 1/2] gnu: xdg-desktop-portal: Update to 1.18.4. Date: Wed, 3 Jul 2024 21:22:45 +0800 Message-ID: <9ba315c8b275edc15894cb75936dacb552f49ab9.1720012870.git.i@dan.games> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.18.4. [patches]: Disable portal tests. [native-inputs]: Remove autoconf, automake, libtool and which. Add python, python-dbusmock, python-pytest and python-pytest-xdist. [inputs]: Add bubblewrap. [phases]<#:configureflags>: Update flags to meson options. Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 25 +++++---- ...-desktop-portal-disable-portal-tests.patch | 56 +++++++++++++++++++ 3 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index cf6b1d61b3..973c4a5dad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2240,6 +2240,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-dbus-group-policy.patch \ %D%/packages/patches/x265-arm-flags.patch \ + %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xen-docs-use-predictable-ordering.patch \ %D%/packages/patches/xen-remove-config.gz-timestamp.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6941450436..2015ee46f8 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2022 Samuel Culpepper ;;; Copyright © 2024 aurtzy ;;; Copyright © 2024 Dariqq +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -133,6 +134,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages video) + #:use-module (gnu packages virtualization) #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -2989,7 +2991,7 @@ (define-public libportal (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.16.0") + (version "1.18.4") (source (origin (method url-fetch) @@ -2998,18 +3000,21 @@ (define-public xdg-desktop-portal version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav")))) - (build-system gnu-build-system) + "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q")) + ;; disable portal tests since they try to use fuse + (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("glib:bin" ,glib "bin") - ("which" ,which) - ("gettext" ,gettext-minimal))) + ("gettext" ,gettext-minimal) + ("python" ,python) + ("python-dbusmock" ,python-dbusmock) + ("python-pytest" ,python-pytest) + ("python-pytest-xdist" ,python-pytest-xdist))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) + `(("bubblewrap" ,bubblewrap) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("flatpak" ,flatpak) ("fontconfig" ,fontconfig) @@ -3021,7 +3026,7 @@ (define-public xdg-desktop-portal ("fuse" ,fuse))) (arguments `(#:configure-flags - (list "--with-systemd=no") + (list "-Dsystemd=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'po-chmod diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch new file mode 100644 index 0000000000..5e13493613 --- /dev/null +++ b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch @@ -0,0 +1,56 @@ +From b7750fa99c31c5f28ac2053fa154bef4038b5cc0 Mon Sep 17 00:00:00 2001 +From: dan +Date: Tue, 2 Jul 2024 19:37:38 +0800 +Subject: [PATCH] tests: remove portal tests. + +--- + tests/meson.build | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index a2dafee..bcd87be 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -181,18 +181,6 @@ portal_tests = [ + + test_env = env_tests + test_env.set('XDG_CURRENT_DESKTOP', 'test') +-foreach p : portal_tests +- test( +- 'test-portals-@0@'.format(p), +- test_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/portal/@0@'.format(p)], +- depends: [test_backends, test_portals], +- env: test_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + # Split the portal tests into one test per portal, this makes debugging a lot + # easier. +@@ -204,18 +192,6 @@ portal_limited = [ + + limited_env = env_tests + limited_env.set('XDG_CURRENT_DESKTOP', 'limited') +-foreach p : portal_limited +- test( +- 'limited-portals-@0@'.format(p), +- limited_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/limited/@0@'.format(p)], +- depends: [test_backends, limited_portals], +- env: limited_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + if enable_installed_tests + install_data( + +base-commit: 11c8a96b147aeae70e3f770313f93b367d53fedd +-- +2.41.0 + base-commit: bab73e413b3421f4aa051e9438d147040a52e1be -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 03 09:23:17 2024 Received: (at 71897) by debbugs.gnu.org; 3 Jul 2024 13:23:17 +0000 Received: from localhost ([127.0.0.1]:39174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOzx6-0000cl-Jn for submit@debbugs.gnu.org; Wed, 03 Jul 2024 09:23:17 -0400 Received: from fout8-smtp.messagingengine.com ([103.168.172.151]:34913) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOzx2-0000cC-9s for 71897@debbugs.gnu.org; Wed, 03 Jul 2024 09:23:15 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.nyi.internal (Postfix) with ESMTP id 628541380189 for <71897@debbugs.gnu.org>; Wed, 3 Jul 2024 09:23:05 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 03 Jul 2024 09:23:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1720012985; x=1720099385; bh=Nnr2/VfP9ib7mXT23hot/RYD28zNnQjUXddADVy96Lo=; b= m+9j56ZDRMD3tWdA1LNg+ma537V9rFqJutce0dE1L/28s7TyHlyCd+sNj5ynZA3w 294FgzArm0YENsnWDYK92K/h2IT/PTt33EiPkxXvMOpoZ8v2DW5regm2E7naImEr DGqZZKQg9elawoAWmJVArtdQXMvasdSf66osPibcBNujgF+2BNqj7RPn4JhvDjVf 0yrsc/sLE+wvbOSJ4fE7nvGHWUpI7JOf/Ci1mCCHsMriFkPfklrOlc7UwFsF/RRy XBVte4f1aoCgg1tlhwdqctRPDQBOBQTFtjmCdJePBURRPuCaMwerqDo1xU7mYQZF CwMMsgpAlsvwprCboL3UOw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1720012985; x= 1720099385; bh=Nnr2/VfP9ib7mXT23hot/RYD28zNnQjUXddADVy96Lo=; b=V kESz0EQyVMlbZew9+4szt3B614SlXc2B7Cc4r7fKkDgDTMQ46nzk5EV5LF2JY/8s m5aLC3wPoq5P9T6ezNUenwUsZ6QGQrNyIDWVbjcOqh+13i6QfFKlmgGgmvioaHRb l9APuQqasJz91v4d+4HongqaBy5OmdJI9qujIazQokPRaW239VyVcKtk8GfrfqAZ muceEvmM2VES1mQYNtOGpxJ6GWJM8/A7kYNVFM7++PVZ6638tLlBmPxHXxvP+/h3 dB9YVLSzVsPvPl9aRWo2/LEN5JVkIazEDAP2aX5F6N1yRNqjVOQfwfmefvijJEMy 7B0UB9SNtERB7bypXGUYg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudejgdeifecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecufghrlhcuvffnffculdduvddmnecujfgurhephffvuf ffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhg rghmvghsqeenucggtffrrghtthgvrhhnpeduudduffejtdejudehieevtdduuddtvdegle ekueeftdfhfeettdehfeejjeeugeenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhk ihhtfigrrhgvrdgtohhmpdhgihhtlhgrsgdrtghomhenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Wed, 3 Jul 2024 09:23:04 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v3 2/2] gnu: telegram-desktop: Update to 5.2.2. Date: Wed, 3 Jul 2024 21:22:46 +0800 Message-ID: <97beab597e192df73feba1ec6eda4d112b3864bf.1720012870.git.i@dan.games> X-Mailer: git-send-email 2.45.2 In-Reply-To: <9ba315c8b275edc15894cb75936dacb552f49ab9.1720012870.git.i@dan.games> References: <9ba315c8b275edc15894cb75936dacb552f49ab9.1720012870.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. * gnu/local.mk (dist_patch_DATA): register them. * gnu/packages/telegram.scm: (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)[origin]: Add patches to unbundle gsl and cppgir. (libprisma-for-telegram-desktop): New variable. (cppgir-for-telegram-desktop): New variable. (telegram-desktop): Update to 5.2.2. [arguments]<#:phases>: Add libprisma-for-telegram-desktop. : New phase. : New phase. [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite and gobject-introspection. Change-Id: I75441a6284e3755f510a7d3ba5746bfbb8acbb91 --- gnu/local.mk | 2 + .../telegram-desktop-unbundle-cppgir.patch | 95 +++++++++++++ .../telegram-desktop-unbundle-gsl.patch | 31 +++++ gnu/packages/telegram.scm | 129 +++++++++++++----- 4 files changed, 226 insertions(+), 31 deletions(-) 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 973c4a5dad..2d4f866491 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2135,6 +2135,8 @@ 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-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-unbundle-cppgir.patch b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch new file mode 100644 index 0000000000..a24dbe25bb --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch @@ -0,0 +1,95 @@ +From a5c42e07ae223d440ff11347e0cf1fd58fd383df Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 1/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/CMakeLists.txt | 4 +++- + external/glib/generate_cppgir.cmake | 7 ++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt +index 3c6fe4be..c862705f 100644 +--- a/external/glib/CMakeLists.txt ++++ b/external/glib/CMakeLists.txt +@@ -13,9 +13,11 @@ function(add_cppgir) # isolate scope + set(BUILD_EXAMPLES OFF) + add_subdirectory(cppgir EXCLUDE_FROM_ALL) + endfunction() +-add_cppgir() + + include(generate_cppgir.cmake) ++if (NOT CppGir_FOUND) ++ add_cppgir() ++endif() + generate_cppgir(external_glib Gio-2.0) + + find_package(PkgConfig REQUIRED) +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index c15d3f9e..9b0a5ac8 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 2.0) ++ + function(generate_cppgir target_name gir) + set(cppgir_loc ${cmake_helpers_loc}/external/glib/cppgir) + +@@ -17,6 +19,9 @@ function(generate_cppgir target_name gir) + ${cppgir_loc}/data/cppgir.ignore + ${cppgir_loc}/data/cppgir_unix.ignore + ) ++ if (CppGir_FOUND) ++ set(ignore_files) # rely on default ignore list ++ endif() + + set(gir_path) + if (IS_ABSOLUTE "${gir}") +@@ -33,7 +38,7 @@ function(generate_cppgir target_name gir) + --class + --class-full + --expected +- --ignore ++ "$<$:--ignore>" + "$" + --output + ${gen_dst} + +From eed39522952c15f448c54290454806dd011c4996 Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 2/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/generate_cppgir.cmake | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index 9b0a5ac8..2ad82277 100644 +--- a/external/glib/generate_cppgir.cmake ++++ b/external/glib/generate_cppgir.cmake +@@ -15,11 +15,12 @@ function(generate_cppgir target_name gir) + + set(gen_timestamp ${gen_dst}/${target_name}_cppgir.timestamp) + +- set(ignore_files +- ${cppgir_loc}/data/cppgir.ignore +- ${cppgir_loc}/data/cppgir_unix.ignore +- ) +- if (CppGir_FOUND) ++ if (NOT CppGir_FOUND) ++ set(ignore_files ++ ${cppgir_loc}/data/cppgir.ignore ++ ${cppgir_loc}/data/cppgir_unix.ignore ++ ) ++ else() + set(ignore_files) # rely on default ignore list + endif() + 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..f89d326a5c --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch @@ -0,0 +1,31 @@ +From a3ac6df0441b4caca28b1df87febc420e18942ce Mon Sep 17 00:00:00 2001 +From: Zephyr Lykos +Date: Mon, 23 Oct 2023 15:55:24 +0800 +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 8eaf19c5..344f9488 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) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 358374a5bb..533e976f6f 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2023 Lu Hui ;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; Copyright © 2024 Ricardo Wurmus +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,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) @@ -54,6 +56,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages lua) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -82,11 +85,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 "5.2.2") (define libyuv-for-telegram-desktop - (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") - (revision "2439")) + (let ((commit "04821d1e7d60845525e8db55c7bcd41ef5be9406") + (revision "2440")) (origin (method git-fetch) (uri (git-reference @@ -97,67 +100,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 "5742caae65e4163e7faec238eb4e3e5c219ad09c"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) + (patches + ;; https://github.com/desktop-app/cmake_helpers/pull/320 + ;; https://github.com/desktop-app/cmake_helpers/pull/305 + (search-patches "telegram-desktop-unbundle-gsl.patch" + "telegram-desktop-unbundle-cppgir.patch")) (sha256 (base32 - "0y96mvzs113zh8bdw1h3i6l0pgwg93rigrday8kfdg4magz686k6")))) + "1ld74wd4gyx22gd132ci13sbzis7ypxqiyk4y0mrlhjvmciq9nw1")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "1a969faa0afb29d53af03e530775eccdfb8433f1"))) + (commit "0af136124083369073b8fdaf45f0816fd2b10bad"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1xmw8dfm51p5g20rlmzqnr72a14ngyxwq09an8clf1v5s6mmwvak")))) + "057bwn9smrgnyfb1vraf50ihbkhjc4d72msl7vnbqc4h5sg8dav9")))) (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 "f30400147d997fedc787e214467d305db6c159e7"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83")))) + "0mm88xj9q9v5p0z7byjfpbmw8h6rqg9ya9m0jhfzi2s8iglz0cga")))) (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 @@ -188,24 +196,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 "0b7622ff38778e9cd03d3997de59351973480a1f"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "147xbbcza5q4wcdipk5jplajzkc48971kg2s7qv5jlz33sxkw1lq")))) + "0s9fjxpxxvj1xgzg3sfw6079blgmdvbb5cy6wb921sqaqwf52j6x")))) (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 "0971b69ca90f1697ef81276d9820dcd6d26de4ac"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) + "0ihbh1ajns0sf42h9992hnawwjr1n439sgb0g4zirn2bj5i1zbdv")))) (define lib-tl-for-telegram-desktop (origin @@ -224,52 +232,52 @@ (define lib-ui-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "37531086ec21a8569deddedb11b402f8a3157b90"))) + (commit "ebd8609ee73d48186b905787dd5bb3bcbb4f9f3f"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0")))) + "0abpb0gi3k99pm5zh5gh9czhi48jqvr6wy0yli004hswlfqs2nxk")))) (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "b68a95ad4d1ae9a1827671100a7fd76cbe448c3f"))) + (commit "f701713cd798bd7d5f69d318fdefb125d101aa76"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1c8jwdnn26n13yp0rp0l71q6xlxa6wp3cspbm3pnghw964jwgp3z")))) + "1hki5lc2jrack0r7wyixfh3c08jnmnw3pfrggrznvj4kq490z1b4")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "f632fc84cbc62ae8abbbd05f81d472757a337c11"))) + (commit "659b9181240aae16c05ef8ab7e6c4dd527afcf8a"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i")))) + "1hg8jnpkszf3rrbnkqq9xc3n743602vkjp4kj8rccw7syjmgvrf1")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "2e2797648aac2588e7fe479c2e8b4455ec65c5e6"))) + (commit "b9fa8b84d8abe741183f157218ac038c596a54a5"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) + "1swni7xw5l0q376b6rnf9h93arzjqm9rkv7g6hz67742lf9a0x9z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") - (revision "389")) + (let ((commit "c9cc4390ab951f2cbc103ff783a11f398b27660b") + (revision "399")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -285,7 +293,7 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) + (base32 "0x2hjliiapb9kacbg8fwkz7g09c9k8dc77xxycjh5kmm1fc2i6dd")) (patches (search-patches ;; https://github.com/desktop-app/tg_owt/pull/123 @@ -400,6 +408,47 @@ (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 "23b0d70f9709da9b38561d5706891a134d18df76"))) + (file-name + (git-file-name "libprisma-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) + +(define cppgir-for-telegram-desktop + (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") + (revision "0")) + (package + (name "cppgir-for-telegram-desktop") + (version (git-version "2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fa9nf4yljfarihaqj5kd98yysrky7q316mh6l5b1rq39ga15k9b")))) + (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 "GObject introspection C++ binding wrapper generator") + (description "cppgir processes .gir files derived from GObject +introspection annotations into a set of C++ files defining suitable +namespaces, classes and other types that together form a C++ binding.") + (license license:expat)))) + (define-public telegram-desktop (package (name "telegram-desktop") @@ -415,7 +464,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) + (base32 "0ik74jdvjlan34mykidgrk8d7p2b2y27ax5szvx7kdas7vmbl7k1")) (patches (search-patches ;; https://github.com/telegramdesktop/tdesktop/pull/24126 @@ -481,7 +530,20 @@ (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 'unpack-additional-sources 'use-system-xdg-desktop-portal + (lambda _ + (substitute* (list "Telegram/CMakeLists.txt" + "Telegram/lib_base/CMakeLists.txt") + (("\\$\\{third_party_loc\\}/xdg-desktop-portal/data") + (string-append #$(this-package-native-input "xdg-desktop-portal") + "/share/dbus-1/interfaces"))))) (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 @@ -490,17 +552,22 @@ (define-public telegram-desktop (list `(,glib "bin") `(,gtk+ "bin") pkg-config - python-wrapper)) + python-wrapper + xdg-desktop-portal)) (inputs (list abseil-cpp-cxxstd17 alsa-lib + boost c++-gsl crc32c + cppgir-for-telegram-desktop + expected-lite fcitx-qt5 fcitx5-qt ffmpeg glib glibmm-2.76 + gobject-introspection gtk+ hime hunspell -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 03 13:03:09 2024 Received: (at 71897) by debbugs.gnu.org; 3 Jul 2024 17:03:09 +0000 Received: from localhost ([127.0.0.1]:40308 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP3Ns-0007HL-IC for submit@debbugs.gnu.org; Wed, 03 Jul 2024 13:03:09 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:61565) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP3Np-0007H9-LT for 71897@debbugs.gnu.org; Wed, 03 Jul 2024 13:03:07 -0400 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-a75131ce948so547823066b.2 for <71897@debbugs.gnu.org>; Wed, 03 Jul 2024 10:03:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720026123; x=1720630923; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=dGZBGHbvuwfzcqCY5ZvdQITjxu9Sirr+F4yvL7QE2n4=; b=RNBm0Wb4xW8gz6GQuU9LUJby+EreSXznCuwZ3T++NCfEjx/qiNhYVQrg0xmsYd9sTJ PbP3fCpG8hOc/akoItTsa0D/qiIetRNLKK5fDmahTLR+fPZ3UqXSKKAMk/7z+Y0DBfvz GAsi+URk+4z57VfIhJwKVmkp30aCyOkAoKx6zp8MnYVXXrBboqDACOZzGGZQMU6nNFne aw3DQIz/NOOgtHWhaYr3rxamSULQFvzVVmB/2750KpIUGS2b2khDHaWtpKaAPueCFMvn 71Wxyyj6iD5yXvEWb7vkYL9VxWlQ9Z4lBZ7Bla9DZHivQbW2n06DA98etFwQIokYDQVd Ngww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720026123; x=1720630923; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=dGZBGHbvuwfzcqCY5ZvdQITjxu9Sirr+F4yvL7QE2n4=; b=O5iP+IgjQ31X9GStUD7xD8sfrm3UK3S3PiQ6vBX4vOeU9SLFn+/CQ+oBPJcMeTCc+9 LxREwJkFzyPa2OVl/bJdBiJk03Ll7bl+ZLlwLs8648UZR/KK7QqE7z6BxXaNKxwJd3C7 pSqpJdDK+//vOCbItYYl2NpMFAXQnFOHF7uK43a5G3oYiu71CMa7AAtMgHRqtaR4+rVM hM4BxgEN5WXdZ3zBalRP/GjS9kP2tLaeR8wgkpZoxb5AeuUYr0d3ZEnB12DMe306r4Ra XRj2f1zI4jaWmr775u3UZj+u4yACKaXZjAitwkd7Lv3K5iWZAqSTr0CnN2alUHL+bY8z 8qyg== X-Forwarded-Encrypted: i=1; AJvYcCXNqZc3/KVGYV3vo90IWHoI5eUo3M56qmSY3Ncb8RQ+x6UKuvefup5MIc62nv4I8OvfhKYvpBh3aRWWzsi1rYaqFc8KtAE= X-Gm-Message-State: AOJu0YymGnNNpzzLuK2uPNNk2qBoFHB2PLsvJZ1jtcvu0jZmisgWfdoi dypd0qWmKLK442hamBJcR8SyA1/ada288xV88MuJgKC0bD9ikVJ0 X-Google-Smtp-Source: AGHT+IFEvMYMpb+pZjOsd8ccA84D8y2XLvJQjhEjPUX6YXRcu5LSJdUSe2m3vpEUCGMue6lKh1P61w== X-Received: by 2002:a17:906:4693:b0:a74:84e8:9994 with SMTP id a640c23a62f3a-a751444dae8mr836091266b.45.1720026122411; Wed, 03 Jul 2024 10:02:02 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72aaf5290dsm521685766b.48.2024.07.03.10.02.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 10:02:01 -0700 (PDT) Message-ID: Subject: Re: [bug#71897] [PATCH v3 1/2] gnu: xdg-desktop-portal: Update to 1.18.4. From: Liliana Marie Prikler To: dan , 71897@debbugs.gnu.org Date: Wed, 03 Jul 2024 19:01:59 +0200 In-Reply-To: <9ba315c8b275edc15894cb75936dacb552f49ab9.1720012870.git.i@dan.games> References: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@dan.games> <9ba315c8b275edc15894cb75936dacb552f49ab9.1720012870.git.i@dan.games> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Am Mittwoch, dem 03.07.2024 um 21:22 +0800 schrieb dan: > * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: > New file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/pac [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.218.66 listed in bl.score.senderscore.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.66 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.66 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 71897 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) QW0gTWl0dHdvY2gsIGRlbSAwMy4wNy4yMDI0IHVtIDIxOjIyICswODAwIHNjaHJpZWIgZGFuOgo+ ICogZ251L3BhY2thZ2VzL3BhdGNoZXMveGRnLWRlc2t0b3AtcG9ydGFsLWRpc2FibGUtcG9ydGFs LXRlc3RzLnBhdGNoOgo+IE5ldyBmaWxlLgo+ICogZ251L2xvY2FsLm1rIChkaXN0X3BhdGNoX0RB VEEpOiBSZWdpc3RlciBpdC4KPiAqIGdudS9wYWNrYWdlcy9mcmVlZGVza3RvcC5zY20gKHhkZy1k ZXNrdG9wLXBvcnRhbCk6IFVwZGF0ZSB0bwo+IDEuMTguNC4KPiBbcGF0Y2hlc106IERpc2FibGUg cG9ydGFsIHRlc3RzLgo+IFtuYXRpdmUtaW5wdXRzXTogUmVtb3ZlIGF1dG9jb25mLCBhdXRvbWFr ZSwgbGlidG9vbCBhbmQgd2hpY2guwqAgQWRkCj4gcHl0aG9uLAo+IHB5dGhvbi1kYnVzbW9jaywg cHl0aG9uLXB5dGVzdCBhbmQgcHl0aG9uLXB5dGVzdC14ZGlzdC4KPiBbaW5wdXRzXTogQWRkIGJ1 YmJsZXdyYXAuCj4gW3BoYXNlc108Izpjb25maWd1cmVmbGFncz46IFVwZGF0ZSBmbGFncyB0byBt ZXNvbiBvcHRpb25zLgpOaXQtcGljazogeW91IG1pc3NwZWxsZWQgIzpjb25maWd1cmUtZmxhZ3Mu Cgo+IENoYW5nZS1JZDogSWM5ODc2NTY1ZTkxMTk0NDNmZWRkMDgyMjczYmU0ZjM3MmViY2UxZDQK PiAtLS0KPiDCoGdudS9sb2NhbC5ta8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCB8wqAgMSArCj4gwqBnbnUvcGFja2FnZXMv ZnJlZWRlc2t0b3Auc2NtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCB8IDI1ICsr KysrLS0tLQo+IMKgLi4uLWRlc2t0b3AtcG9ydGFsLWRpc2FibGUtcG9ydGFsLXRlc3RzLnBhdGNo IHwgNTYKPiArKysrKysrKysrKysrKysrKysrCj4gwqAzIGZpbGVzIGNoYW5nZWQsIDcyIGluc2Vy dGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQo+IMKgY3JlYXRlIG1vZGUgMTAwNjQ0IGdudS9wYWNr YWdlcy9wYXRjaGVzL3hkZy1kZXNrdG9wLXBvcnRhbC1kaXNhYmxlLQo+IHBvcnRhbC10ZXN0cy5w YXRjaAo+IAo+IGRpZmYgLS1naXQgYS9nbnUvbG9jYWwubWsgYi9nbnUvbG9jYWwubWsKPiBpbmRl eCBjZjZiMWQ2MWIzLi45NzNjNGE1ZGFkIDEwMDY0NAo+IC0tLSBhL2dudS9sb2NhbC5tawo+ICsr KyBiL2dudS9sb2NhbC5tawo+IEBAIC0yMjQwLDYgKzIyNDAsNyBAQCBkaXN0X3BhdGNoX0RBVEEK PiA9wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoFwKPiDCoMKgICVEJS9wYWNrYWdlcy9wYXRjaGVz L3dvcmRuZXQtQ1ZFLTIwMDgtMzkwOC0KPiBwdDIucGF0Y2jCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgXAo+IMKgwqAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvd3BhLXN1cHBsaWNhbnQt ZGJ1cy1ncm91cC0KPiBwb2xpY3kucGF0Y2jCoMKgwqDCoMKgwqDCoMKgwqDCoFwKPiDCoMKgICVE JS9wYWNrYWdlcy9wYXRjaGVzL3gyNjUtYXJtLWZsYWdzLnBhdGNowqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoFwKPiArwqAgJUQlL3BhY2thZ2VzL3BhdGNoZXMveGRnLWRl c2t0b3AtcG9ydGFsLWRpc2FibGUtcG9ydGFsLQo+IHRlc3RzLnBhdGNoXAo+IMKgwqAgJUQlL3Bh Y2thZ2VzL3BhdGNoZXMveGRnLWRlc2t0b3AtcG9ydGFsLXdsci1oYXJjb2RlZC1sZW5ndGgucGF0 Y2hcCj4gwqDCoCAlRCUvcGFja2FnZXMvcGF0Y2hlcy94ZW4tZG9jcy11c2UtcHJlZGljdGFibGUt b3JkZXJpbmcucGF0Y2jCoFwKPiDCoMKgICVEJS9wYWNrYWdlcy9wYXRjaGVzL3hlbi1yZW1vdmUt Y29uZmlnLmd6LXRpbWVzdGFtcC5wYXRjaMKgwqDCoMKgXAo+IGRpZmYgLS1naXQgYS9nbnUvcGFj a2FnZXMvZnJlZWRlc2t0b3Auc2NtCj4gYi9nbnUvcGFja2FnZXMvZnJlZWRlc2t0b3Auc2NtCj4g aW5kZXggNjk0MTQ1MDQzNi4uMjAxNWVlNDZmOCAxMDA2NDQKPiAtLS0gYS9nbnUvcGFja2FnZXMv ZnJlZWRlc2t0b3Auc2NtCj4gKysrIGIvZ251L3BhY2thZ2VzL2ZyZWVkZXNrdG9wLnNjbQo+IEBA IC0zOCw2ICszOCw3IEBACj4gwqA7OzsgQ29weXJpZ2h0IMKpIDIwMjIgU2FtdWVsIEN1bHBlcHBl ciA8c2N1bHBlcHBlckBuZXdzdG9yZS5jb20+Cj4gwqA7OzsgQ29weXJpZ2h0IMKpIDIwMjQgYXVy dHp5IDxhdXJ0enlAZ21haWwuY29tPgo+IMKgOzs7IENvcHlyaWdodCDCqSAyMDI0IERhcmlxcSA8 ZGFyaXFxQHBvc3Rlby5uZXQ+Cj4gKzs7OyBDb3B5cmlnaHQgwqkgMjAyNCBkYW4gPGlAZGFuLmdh bWVzPgo+IMKgOzs7Cj4gwqA7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCj4gwqA7 OzsKPiBAQCAtMTMzLDYgKzEzNCw3IEBAIChkZWZpbmUtbW9kdWxlIChnbnUgcGFja2FnZXMgZnJl ZWRlc2t0b3ApCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB0bHMpCj4gwqDCoCAj OnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB2YWxncmluZCkKPiDCoMKgICM6dXNlLW1vZHVsZSAo Z251IHBhY2thZ2VzIHZpZGVvKQo+ICvCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB2aXJ0 dWFsaXphdGlvbikKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHczbSkKPiDCoMKg ICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHdlYikKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251 IHBhY2thZ2VzIHhkaXNvcmcpCj4gQEAgLTI5ODksNyArMjk5MSw3IEBAIChkZWZpbmUtcHVibGlj IGxpYnBvcnRhbAo+IMKgKGRlZmluZS1wdWJsaWMgeGRnLWRlc2t0b3AtcG9ydGFsCj4gwqDCoCAo cGFja2FnZQo+IMKgwqDCoMKgIChuYW1lICJ4ZGctZGVza3RvcC1wb3J0YWwiKQo+IC3CoMKgwqAg KHZlcnNpb24gIjEuMTYuMCIpCj4gK8KgwqDCoCAodmVyc2lvbiAiMS4xOC40IikKPiDCoMKgwqDC oCAoc291cmNlCj4gwqDCoMKgwqDCoCAob3JpZ2luCj4gwqDCoMKgwqDCoMKgwqAgKG1ldGhvZCB1 cmwtZmV0Y2gpCj4gQEAgLTI5OTgsMTggKzMwMDAsMjEgQEAgKGRlZmluZS1wdWJsaWMgeGRnLWRl c2t0b3AtcG9ydGFsCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgdmVyc2lvbiAiL3hkZy1k ZXNrdG9wLXBvcnRhbC0iIHZlcnNpb24gIi50YXIueHoiKSkKPiDCoMKgwqDCoMKgwqDCoCAoc2hh MjU2Cj4gwqDCoMKgwqDCoMKgwqDCoCAoYmFzZTMyCj4gLcKgwqDCoMKgwqDCoMKgwqAgIjA2Y2N6 bGgzOWtjNDFydmF2MDZ2MzdzYWQ4Mjd5NjFyZmZ5M3YyOWk5MThpYmo4c2FoYXYiKSkpKQo+IC3C oMKgwqAgKGJ1aWxkLXN5c3RlbSBnbnUtYnVpbGQtc3lzdGVtKQo+ICvCoMKgwqDCoMKgwqDCoMKg ICIwcjh5OHFtemNmajdiN2JycWN4cjlsZzhwYXZmZHM4MTVmZnZqMGtxYzM3OGZoZ2FsbjVxIikp Cj4gK8KgwqDCoMKgwqDCoCA7OyBkaXNhYmxlIHBvcnRhbCB0ZXN0cyBzaW5jZSB0aGV5IHRyeSB0 byB1c2UgZnVzZQo+ICvCoMKgwqDCoMKgwqAgKHBhdGNoZXMgKHNlYXJjaC1wYXRjaGVzICJ4ZGct ZGVza3RvcC1wb3J0YWwtZGlzYWJsZS1wb3J0YWwtCj4gdGVzdHMucGF0Y2giKSkpKQo+ICvCoMKg wqAgKGJ1aWxkLXN5c3RlbSBtZXNvbi1idWlsZC1zeXN0ZW0pCj4gwqDCoMKgwqAgKG5hdGl2ZS1p bnB1dHMKPiDCoMKgwqDCoMKgIGAoKCJwa2ctY29uZmlnIiAscGtnLWNvbmZpZykKPiAtwqDCoMKg wqDCoMKgICgiYXV0b2NvbmYiICxhdXRvY29uZikKPiAtwqDCoMKgwqDCoMKgICgiYXV0b21ha2Ui ICxhdXRvbWFrZSkKPiAtwqDCoMKgwqDCoMKgICgibGlidG9vbCIgLGxpYnRvb2wpCj4gwqDCoMKg wqDCoMKgwqAgKCJnbGliOmJpbiIgLGdsaWIgImJpbiIpCj4gLcKgwqDCoMKgwqDCoCAoIndoaWNo IiAsd2hpY2gpCj4gLcKgwqDCoMKgwqDCoCAoImdldHRleHQiICxnZXR0ZXh0LW1pbmltYWwpKSkK PiArwqDCoMKgwqDCoMKgICgiZ2V0dGV4dCIgLGdldHRleHQtbWluaW1hbCkKPiArwqDCoMKgwqDC oMKgICgicHl0aG9uIiAscHl0aG9uKQo+ICvCoMKgwqDCoMKgwqAgKCJweXRob24tZGJ1c21vY2si ICxweXRob24tZGJ1c21vY2spCj4gK8KgwqDCoMKgwqDCoCAoInB5dGhvbi1weXRlc3QiICxweXRo b24tcHl0ZXN0KQo+ICvCoMKgwqDCoMKgwqAgKCJweXRob24tcHl0ZXN0LXhkaXN0IiAscHl0aG9u LXB5dGVzdC14ZGlzdCkpKQo+IMKgwqDCoMKgIChpbnB1dHMKPiAtwqDCoMKgwqAgYCgoImdkay1w aXhidWYiICxnZGstcGl4YnVmKQo+ICvCoMKgwqDCoCBgKCgiYnViYmxld3JhcCIgLGJ1YmJsZXdy YXApCj4gK8KgwqDCoMKgwqDCoCAoImdkay1waXhidWYiICxnZGstcGl4YnVmKQo+IMKgwqDCoMKg wqDCoMKgICgiZ2xpYiIgLGdsaWIpCj4gwqDCoMKgwqDCoMKgwqAgKCJmbGF0cGFrIiAsZmxhdHBh aykKPiDCoMKgwqDCoMKgwqDCoCAoImZvbnRjb25maWciICxmb250Y29uZmlnKQpTaW5jZSB0aGlz IGlzIHN0aWxsIHVzaW5nIG9sZC1zdHlsZSBpbnB1dHMsIGl0IHdvdWxkIGJlIG5pY2UgdG8gZm9s bG93CnVwIHdpdGggYSBzdHlsaW5nIGNvbW1pdC4KCgpDaGVlcnMK From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 03 13:07:13 2024 Received: (at 71897) by debbugs.gnu.org; 3 Jul 2024 17:07:13 +0000 Received: from localhost ([127.0.0.1]:40312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP3Rp-0007Pn-E1 for submit@debbugs.gnu.org; Wed, 03 Jul 2024 13:07:13 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:54510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP3Rn-0007PY-CF for 71897@debbugs.gnu.org; Wed, 03 Jul 2024 13:07:12 -0400 Received: by mail-wr1-f68.google.com with SMTP id ffacd0b85a97d-36740e64749so3428198f8f.0 for <71897@debbugs.gnu.org>; Wed, 03 Jul 2024 10:07:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720026364; x=1720631164; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=CobqVKw1ZfE1V8U6EnTeoIO3QpxEptKpf7ghAG+lCtM=; b=nMCw5iKIX4Dom83qKNQZ/mm6LmNHHLlaVrAqwX6EC131sXqeDWuMlHFN7sMX3kBbnS ghtRDu+FFYzT80JqASv8LcfDmRUgxaKToyQlxrSTroLtX8McFbTAvnD1OP0bBj/Np9fn LhlDkErMBbLwpg10KA+hdUggh43K+EMbunEkmQnqcRQg9gjdcLMJyCYGYOF9Jo8j7HEa IYekkwKwEPZ9nFtH0bM0k+nXCRkhXNESK+griuadvb2obTyr62Wsxka+7fSarARGn8Uh BQITYjj/ceGKEAeknD5cxUf0rXoRziSpFSqW4y7mygffN8sDAReAMD6PQzNhoVkVQoqB qqTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720026364; x=1720631164; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=CobqVKw1ZfE1V8U6EnTeoIO3QpxEptKpf7ghAG+lCtM=; b=bYwq4BlUJ7QZGQQWFYPACOh7+Us23ClP0uDL97ullj9UGC7fjjOnLhYHH5hR2vPGwr SDOY9bwCLhZOtOm7909Z+UKixF8MmAffCMtheH6kcTOAPw9VRF7cNkEOGdzycEoHg0pQ hT2NpUQMigTNN2+vgrLofjkiwk1mRMmsy2ytGedOS5xsH0Bz8jVdQrNQtIJXr9r14+ek QG1fibysiixqapyZeKuYJZDLRVm3dr3ch+alMdv+K61iDRrXllnxlU7vh8ZcAVXEGZ24 /alpEGbiOhX3HCwwWlctOwm+2tX+Pc6PbwUGw9u8KMRHjBX2lMWcaDLcrUxq+BpCv+dS m8lQ== X-Forwarded-Encrypted: i=1; AJvYcCWhYtAOVxjQqA6zLMiZgQuCzLHlu9ZMztdvufncMqaFMxQabDCyQUBDqAPxowUlebW+Ix9xgYaj60fx2Rq3wZ08PbghLI0= X-Gm-Message-State: AOJu0YyRyGlwpKW4lNfqIxXV56DK+5uYYlLdJwUAHIZcJ71Siuoi6mlW ZJJcz3SGT8TalN6LUSvOfYnpVyhJTBjTY6n/UmGG2CAd5Ogx1ZiA X-Google-Smtp-Source: AGHT+IFOeJ2C/uTZBMCRP9wbnchvRDRwTACMc9/qVPPiYppKTRAX/CQfTJAihlyXX0tBzJ2ZsFw7gA== X-Received: by 2002:a05:6000:156b:b0:367:844a:1ca3 with SMTP id ffacd0b85a97d-367844a1e4dmr4633230f8f.10.1720026363537; Wed, 03 Jul 2024 10:06:03 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-367908768b4sm2848783f8f.79.2024.07.03.10.06.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 10:06:03 -0700 (PDT) Message-ID: <9a4d69a577f95da528b0e782a45eb50598d8e286.camel@gmail.com> Subject: Re: [bug#71897] [PATCH v3 2/2] gnu: telegram-desktop: Update to 5.2.2. From: Liliana Marie Prikler To: dan , 71897@debbugs.gnu.org Date: Wed, 03 Jul 2024 19:06:02 +0200 In-Reply-To: <97beab597e192df73feba1ec6eda4d112b3864bf.1720012870.git.i@dan.games> References: <9ba315c8b275edc15894cb75936dacb552f49ab9.1720012870.git.i@dan.games> <97beab597e192df73feba1ec6eda4d112b3864bf.1720012870.git.i@dan.games> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Mittwoch, dem 03.07.2024 um 21:22 +0800 schrieb dan: > * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New > file. > * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. > * gnu/local.mk (dist_patch_DATA): register them. > * gnu/packages/telegram.scm: > (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. Note: ChangeLog format uses closing braces. > (cmake-helpers-for-telegram-desktop)[origin]: Add patches to unbundle > gsl and > cppgir. > (libprisma-for-telegram-desktop): New variable. > (cppgir-for-telegram-desktop): New variable. Introduce these in their own commits. > (telegram-desktop): Update to 5.2.2. > [arguments]<#:phases>: Add Shorten this to just [#:phases] =E2=80=93 you're not using any other [arguments], and repeating the same brackets would be confusing. > libprisma-for-telegram-desktop. > : New phase. > : New phase. > [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite and > gobject-introspection. Lexically, the rest LGTM, but I ain't subject my weak machine to that build. Let's see if CI can handle this for us. Cheers From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 03 13:18:31 2024 Received: (at 71897) by debbugs.gnu.org; 3 Jul 2024 17:18:31 +0000 Received: from localhost ([127.0.0.1]:40332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP3cl-0007go-4Q for submit@debbugs.gnu.org; Wed, 03 Jul 2024 13:18:31 -0400 Received: from fout2-smtp.messagingengine.com ([103.168.172.145]:34051) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP3ci-0007gV-EH for 71897@debbugs.gnu.org; Wed, 03 Jul 2024 13:18:29 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.nyi.internal (Postfix) with ESMTP id 9DAE4138026C; Wed, 3 Jul 2024 13:18:19 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 03 Jul 2024 13:18:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1720027099; x=1720113499; bh=2BlbY41dTYeZASJqLN4fcsqJj2UXYZArNv62GPZAnjY=; b= aiv4guRBhcfS5PLZSYgJrv1C52ZrGElcHsHIxpSfb+5O15H4vzYJg/kdgNU6+7VL 0jcoKitI689ypOsuUvsv6wRRdnbXPcUZ2R36igt/htyGMEvscNgoMH/z6MV4pHyl Ntn9KMo9xwSbGKFoQaaQIsiF/qRillkwmceUfkdcjMK8GVURuyZV+H2bXqyhFQqn L1la24Ne5Is8HmEW8+//XXbOCjOCbNO6zgbaQB475uBMce+7Ej0ukYWxAP1OtLBP 5nE4Sd8pmOsN6Zy4xSkILllZjbfWC5khuwnyj0kh83+wmNnFRJxB5eQeeGntWd/z vYkfagkEEHTikyn1GK0Agg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1720027099; x= 1720113499; bh=2BlbY41dTYeZASJqLN4fcsqJj2UXYZArNv62GPZAnjY=; b=m sasByggiMlDVdGtkOMNeOZHarSgdM51hfJ6ffWqytg3Lyz478J9e/sLkOWDNm4lK u1FJ14u2VQ+aFce0OUaaKgSlz0IdPzASIttrTVxKcgKTPefSg+HDFeIIJJnPeHLE k4EjyZSpYdBSmRhYZaiFp4Z3SbCnU0r4hXvpCfqvfBi0MA94IlgkEyW0Dm+IjiGl tQoxpwRFoZNcJuV1G1f5PUFisLKihHnpPYWpn1Yp/6bwXjSXrZAgwL39FjE0EdXY EVjga4KUMqeaI2LUblk4cPNz6abyU0VTDxlV23UZ1msxGilDR6pn94ktKQkZ9dQN wy+ipp5xKHsjs3vNJx1jg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudejgdduuddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevkfgjfhfugggtgfesthhqredttddtjeenucfhrhhomhepuggrnhcu oehisegurghnrdhgrghmvghsqeenucggtffrrghtthgvrhhnpeeuieelteeuhfdvfeelte ethfekfeeuudffffegjedtkedtheegleejvefhleehffenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 3 Jul 2024 13:18:17 -0400 (EDT) Date: Thu, 4 Jul 2024 01:18:04 +0800 (GMT+08:00) From: dan To: Liliana Marie Prikler Message-ID: In-Reply-To: <9a4d69a577f95da528b0e782a45eb50598d8e286.camel@gmail.com> References: <9ba315c8b275edc15894cb75936dacb552f49ab9.1720012870.git.i@dan.games> <97beab597e192df73feba1ec6eda4d112b3864bf.1720012870.git.i@dan.games> <9a4d69a577f95da528b0e782a45eb50598d8e286.camel@gmail.com> Subject: Re: [bug#71897] [PATCH v3 2/2] gnu: telegram-desktop: Update to 5.2.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Correlation-ID: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 Cc: Maxim Cournoyer , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Jul 4, 2024 01:06:06 Liliana Marie Prikler : > >> (libprisma-for-telegram-desktop): New variable. >> (cppgir-for-telegram-desktop): New variable. > Introduce these in their own commits. But these variables depend on the new %telegram-desktop-version, which is= =20 only updated in this commit.=C2=A0 Personally I feel more comfortable stick= ing=20 these changes together, although it's a bit less ideal.=C2=A0 I would like = to=20 know if there are better ways to do so. From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 03 13:22:18 2024 Received: (at 71897) by debbugs.gnu.org; 3 Jul 2024 17:22:18 +0000 Received: from localhost ([127.0.0.1]:40350 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP3gQ-0007nF-Ik for submit@debbugs.gnu.org; Wed, 03 Jul 2024 13:22:18 -0400 Received: from fhigh7-smtp.messagingengine.com ([103.168.172.158]:44649) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP3gO-0007n1-IO for 71897@debbugs.gnu.org; Wed, 03 Jul 2024 13:22:16 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 6B570114014A; Wed, 3 Jul 2024 13:22:09 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 03 Jul 2024 13:22:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1720027329; x=1720113729; bh=1FAUFuETa0at7nTYlS77jheCbyMxQjYFB51uDbWL994=; b= S2t0gKOrVhHnaPkdNQRCF3C8Ph6Sdp8pw48enZgYmfKOOKyfi1tvbqxsMQNsDK8E TufTKARoSP1SgOrv5GncZ8MUZGZhrpWRHJbESMApMNTFO08w5IuoL3xX+IjuL9JH P/jF8jFpm+eRkNCHRolyFNyMfB72uAf0jKSAvxsqmO0GCnVUsF5F3eU3RBV8Co+T yYwOgIL8z2bNfuck00JaFWEFXEm4WNDBVX7d/C2d32BgkPYf/0dFmmNhtYqg8qXe khGqc/tHcwbTfG9lfiunfPZf/wKj/VQlUQsgBfgJPnRZrvb+cGfvHwHymJ7iZasj 6b5+nzrWhHZQRFCAq9L1Fw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1720027329; x= 1720113729; bh=1FAUFuETa0at7nTYlS77jheCbyMxQjYFB51uDbWL994=; b=C ekytQS7xHKMzwkAWVCReeKqhpjsV6GeozvIh0RWZ37eWYkODjekzS50eRWPkphwi ZqkdigHvMyMR7PBV1114UlSGU4d87yufw9s15FRBTmr8hotteNTtJHBeeCToS9Yf FDSiJ488ZqUvoIgZJV9c3iXqzEFptL5KVir22kkv1MjZL90AWDs71/j/ZKc5P3LG IgVrTxyASG0OEhRSjiC1cX+Y75FzLjHFCCE2XDRC9u4PW8wXdYc6y7q4f+PiD5Hh sXNV1R2On9g2ZAcTmip5iWUO/vLOpYZNAPwPeCdm3zLd8VWI4vu65RMwC17/o/pV ZEqdcs1ClKxf0UrNfafhg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudejgdduudduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevkfgjfhfugggtgfesthhqredttddtjeenucfhrhhomhepuggrnhcu oehisegurghnrdhgrghmvghsqeenucggtffrrghtthgvrhhnpeeuieelteeuhfdvfeelte ethfekfeeuudffffegjedtkedtheegleejvefhleehffenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 3 Jul 2024 13:22:07 -0400 (EDT) Date: Thu, 4 Jul 2024 01:22:00 +0800 (GMT+08:00) From: dan To: Liliana Marie Prikler Message-ID: <7b62701f-c3fa-4413-81d5-b9ea17b2c103@dan.games> In-Reply-To: References: <9ba315c8b275edc15894cb75936dacb552f49ab9.1720012870.git.i@dan.games> <97beab597e192df73feba1ec6eda4d112b3864bf.1720012870.git.i@dan.games> <9a4d69a577f95da528b0e782a45eb50598d8e286.camel@gmail.com> Subject: Re: [bug#71897] [PATCH v3 2/2] gnu: telegram-desktop: Update to 5.2.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Correlation-ID: <7b62701f-c3fa-4413-81d5-b9ea17b2c103@dan.games> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 Cc: Maxim Cournoyer , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Jul 4, 2024 01:18:19 dan : > Jul 4, 2024 01:06:06 Liliana Marie Prikler : >> >>> (libprisma-for-telegram-desktop): New variable. >>> (cppgir-for-telegram-desktop): New variable. >> Introduce these in their own commits. > But these variables depend on the new %telegram-desktop-version, which=20 > is only updated in this commit.=C2=A0 Personally I feel more comfortable= =20 > sticking these changes together, although it's a bit less ideal.=C2=A0 I= =20 > would like to know if there are better ways to do so. Oh I misread, cppgir probably can be split to a dedicated commit since=20 it's using their own version number. From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 03 14:22:26 2024 Received: (at 71897) by debbugs.gnu.org; 3 Jul 2024 18:22:26 +0000 Received: from localhost ([127.0.0.1]:40441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP4cc-0000sS-A7 for submit@debbugs.gnu.org; Wed, 03 Jul 2024 14:22:26 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:56695) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP4ca-0000sD-9H for 71897@debbugs.gnu.org; Wed, 03 Jul 2024 14:22:25 -0400 Received: by mail-lf1-f65.google.com with SMTP id 2adb3069b0e04-52cecba8d11so6896609e87.1 for <71897@debbugs.gnu.org>; Wed, 03 Jul 2024 11:22:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720030876; x=1720635676; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=MYW6OLlkgeA0W4ZweOP+swwuB3f6mNtoV4dCBIu3DdM=; b=FGitn2mZ/Mbj+yiamAaNjabzyLElPGVD0d6+NCewTUZvLYuM8a+0beNHohkFIVMnfF uaPbpDfFUAEiyAyT8wzvn76hahdR8RAedXdaoI8BSebIsro8hcuFkBaEtn41wju181Ly fn18L1ikvwxKR13N/kx9xA1x4SKWOg6PeGV+im7NWwovw0/dOEgqVTIiVsmZfHFe6ASn P4zrLLiFd4vSm3waGcxG4X6opavuWqinoCs1yq4qDPAZoLweHfGtPwvBhjfb3mhbMFSl neWgupS2UZUgu/yOUjn6BMniyDgVKuo5nYB0PQmXAcxx2s9gGbZE5q2MSy+sWgpsCuAY vJkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720030876; x=1720635676; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=MYW6OLlkgeA0W4ZweOP+swwuB3f6mNtoV4dCBIu3DdM=; b=GJG4YmAsAVJDAPX3/3tBeyNbcqeGAPZ+mLsNnxxtnOrQbfo2y1TfUmcZz18w6lyaUd CjutF9537CV7czl/rLd2qtsaamrkf3pqZAZnmRdzs8VU9WX9l8JFqj9UEklCqAlCCBzT V2azBnwJL0gckQ8V863oTtg4g7/nbLaXW8ChfwuawTHr8XUxFGjUf5fJ0G83vwzEp7RV us+o808/9sZlUouZA+QLXow+9B3QIpiQh3ptZ7dVx0nomNB7W/zvejL++Fj4ai6SHtM+ hAOJw6FpGy4EZN8WzS18HDZC5Ag5BVq0vFVHswYztPy7iu5agG7pJnougoKsJ6iPqwB2 3lJQ== X-Gm-Message-State: AOJu0Yzmdhf+Ucbsj1MDYg45y9Q7OwcrJ/6EZbm8dRgtOLciC5+H7MV8 Af+GZRAxPtA+ARVaQQNpXpBhcQQlXz5/o1D9l49GwpKChOEDAvxU X-Google-Smtp-Source: AGHT+IG0dE5NEyBqCbZTBXNaC8YjBByOftyVqEuknB5TT3oFKjYU2s3wwt7cp/uy3tl8tVLkU2EBQw== X-Received: by 2002:a05:6512:10d6:b0:52c:dc57:868b with SMTP id 2adb3069b0e04-52e8264b5bdmr9405322e87.13.1720030875941; Wed, 03 Jul 2024 11:21:15 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72aaf60447sm528621666b.59.2024.07.03.11.21.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 11:21:15 -0700 (PDT) Message-ID: <3454cb3f4903d4caca4af4f41fdd5b324ca439b4.camel@gmail.com> Subject: Re: [bug#71897] [PATCH v3 2/2] gnu: telegram-desktop: Update to 5.2.2. From: Liliana Marie Prikler To: dan Date: Wed, 03 Jul 2024 20:21:13 +0200 In-Reply-To: <7b62701f-c3fa-4413-81d5-b9ea17b2c103@dan.games> References: <9ba315c8b275edc15894cb75936dacb552f49ab9.1720012870.git.i@dan.games> <97beab597e192df73feba1ec6eda4d112b3864bf.1720012870.git.i@dan.games> <9a4d69a577f95da528b0e782a45eb50598d8e286.camel@gmail.com> <7b62701f-c3fa-4413-81d5-b9ea17b2c103@dan.games> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Maxim Cournoyer , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 04.07.2024 um 01:22 +0800 schrieb dan: > Jul 4, 2024 01:18:19 dan : >=20 > > Jul 4, 2024 01:06:06 Liliana Marie Prikler > > : > > >=20 > > > > (libprisma-for-telegram-desktop): New variable. > > > > (cppgir-for-telegram-desktop): New variable. > > > Introduce these in their own commits. > > But these variables depend on the new %telegram-desktop-version, > > which is only updated in this commit.=C2=A0 Personally I feel more > > comfortable sticking these changes together, although it's a bit > > less ideal.=C2=A0 I would like to know if there are better ways to do > > so. > Oh I misread, cppgir probably can be split to a dedicated commit > since it's using their own version number. For libprisma, assuming it uses %telegram-desktop-version, you can make it to do so in the commit that updates telegram and hardcode the version prior to that. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 07 11:01:17 2024 Received: (at 71897) by debbugs.gnu.org; 7 Jul 2024 15:01:17 +0000 Received: from localhost ([127.0.0.1]:48953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTO8-0001la-Cg for submit@debbugs.gnu.org; Sun, 07 Jul 2024 11:01:17 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]:55349) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTO2-0001lC-Qt for 71897@debbugs.gnu.org; Sun, 07 Jul 2024 11:01:14 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfout.nyi.internal (Postfix) with ESMTP id 4796C13804C4 for <71897@debbugs.gnu.org>; Sun, 7 Jul 2024 11:01:01 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sun, 07 Jul 2024 11:01:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm3; t=1720364461; x=1720450861; bh=kujeM1f2Ht insOu2H30+Mq4sVgEY/3I2iEtTGVHcBDM=; b=jFdjU8mDd4dbuc31Qw9q2W0DAU 0hiQsaPghYtD2Wc3HbHi/mMOBQe0SvrfOeS539v91ulbp/k7jnNwfJFJsTVH6fTq 1cMZVPq6rSxN+N4m7b6k//QXeenmwCaLw+Xcq++w9OGevpTSxfMyTtPEIRDMdb1Z wyKEF6G5B0sEtn+wWVqzmHQ/Hc5axw495zgKJeoK0386LqlHOjGU6tRY6i74+JuE /QrKrDpmmzHmCpsyWDHVBtOFtsY2p+zinjxh8RMQ8w1KwATpTDZKC4D3gSj3yjMW w+wyMdTUJEHicXHXB8TRw+gp9p7XICAPaCioPWMd2R1yJVTDh0uDkZjNzDZA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1720364461; x=1720450861; bh=kujeM1f2HtinsOu2H30+Mq4sVgEY /3I2iEtTGVHcBDM=; b=uKmD4h2Je0Ca4kM67CGCJRDbtWf6/yXgEdxWzgGtS2St /+bOlE7cYYIrZlCAODNa8Z+0qCS1bnL5Wi1ZuZ8VsB638KhPgmW8wL/YemDsud6/ PBrw9ymMcokJFMi88Im8288SxcL1wNrdlU8Se0fGsfF8pw9SsTVgumyL2FL+9WXA z+22iHSoGwd9XnAbQLiU6KNodPYXYxARXvnaAE2Xt0vjuP4by9BKUXfQgRpZcJqG WpcX/zzDQK2hHIOx0kfV9syFww6V7yf/68So0PENz7qHx8dxu+yR5ogizSZbIgAH /Ls/ti6IsetAEcQ9NBX+1Ak8e15sM+JliqtR6khsMA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehgdekhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekredtre dtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgv rhhnpeegjeehgffggffgieehkedvkeevtefgjeetfedutdefvedttedutdefheehhfdthe enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegu rghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 7 Jul 2024 11:00:59 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH 1/5] gnu: xdg-desktop-portal: Update to 1.18.4. Date: Sun, 7 Jul 2024 23:00:20 +0800 Message-ID: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.18.4. [patches]: Disable portal tests. [native-inputs]: Remove autoconf, automake, libtool and which. Add python, python-dbusmock, python-pytest and python-pytest-xdist. [inputs]: Add bubblewrap. [phases]<#:configure-flags>: Update flags to meson options. Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 25 +++++---- ...-desktop-portal-disable-portal-tests.patch | 56 +++++++++++++++++++ 3 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 329eaf9358..bb53b08b8e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2240,6 +2240,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-dbus-group-policy.patch \ %D%/packages/patches/x265-arm-flags.patch \ + %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xen-docs-use-predictable-ordering.patch \ %D%/packages/patches/xen-remove-config.gz-timestamp.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6941450436..2015ee46f8 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2022 Samuel Culpepper ;;; Copyright © 2024 aurtzy ;;; Copyright © 2024 Dariqq +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -133,6 +134,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages video) + #:use-module (gnu packages virtualization) #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -2989,7 +2991,7 @@ (define-public libportal (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.16.0") + (version "1.18.4") (source (origin (method url-fetch) @@ -2998,18 +3000,21 @@ (define-public xdg-desktop-portal version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav")))) - (build-system gnu-build-system) + "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q")) + ;; disable portal tests since they try to use fuse + (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("glib:bin" ,glib "bin") - ("which" ,which) - ("gettext" ,gettext-minimal))) + ("gettext" ,gettext-minimal) + ("python" ,python) + ("python-dbusmock" ,python-dbusmock) + ("python-pytest" ,python-pytest) + ("python-pytest-xdist" ,python-pytest-xdist))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) + `(("bubblewrap" ,bubblewrap) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("flatpak" ,flatpak) ("fontconfig" ,fontconfig) @@ -3021,7 +3026,7 @@ (define-public xdg-desktop-portal ("fuse" ,fuse))) (arguments `(#:configure-flags - (list "--with-systemd=no") + (list "-Dsystemd=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'po-chmod diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch new file mode 100644 index 0000000000..5e13493613 --- /dev/null +++ b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch @@ -0,0 +1,56 @@ +From b7750fa99c31c5f28ac2053fa154bef4038b5cc0 Mon Sep 17 00:00:00 2001 +From: dan +Date: Tue, 2 Jul 2024 19:37:38 +0800 +Subject: [PATCH] tests: remove portal tests. + +--- + tests/meson.build | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index a2dafee..bcd87be 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -181,18 +181,6 @@ portal_tests = [ + + test_env = env_tests + test_env.set('XDG_CURRENT_DESKTOP', 'test') +-foreach p : portal_tests +- test( +- 'test-portals-@0@'.format(p), +- test_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/portal/@0@'.format(p)], +- depends: [test_backends, test_portals], +- env: test_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + # Split the portal tests into one test per portal, this makes debugging a lot + # easier. +@@ -204,18 +192,6 @@ portal_limited = [ + + limited_env = env_tests + limited_env.set('XDG_CURRENT_DESKTOP', 'limited') +-foreach p : portal_limited +- test( +- 'limited-portals-@0@'.format(p), +- limited_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/limited/@0@'.format(p)], +- depends: [test_backends, limited_portals], +- env: limited_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + if enable_installed_tests + install_data( + +base-commit: 11c8a96b147aeae70e3f770313f93b367d53fedd +-- +2.41.0 + base-commit: c86a07bacc2469e7a00fbc66cfe4f322e4bafb06 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 07 11:01:18 2024 Received: (at 71897) by debbugs.gnu.org; 7 Jul 2024 15:01:18 +0000 Received: from localhost ([127.0.0.1]:48955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTOA-0001ln-8T for submit@debbugs.gnu.org; Sun, 07 Jul 2024 11:01:18 -0400 Received: from fhigh8-smtp.messagingengine.com ([103.168.172.159]:49453) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTO8-0001lL-63 for 71897@debbugs.gnu.org; Sun, 07 Jul 2024 11:01:16 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfhigh.nyi.internal (Postfix) with ESMTP id AD25D11402E7 for <71897@debbugs.gnu.org>; Sun, 7 Jul 2024 11:01:06 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Sun, 07 Jul 2024 11:01:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1720364466; x= 1720450866; bh=s0ElIGEZ/w5qUaY76MOIgbVu4ZRSfsnFVzsMbM7EZ3E=; b=N HlEtLUzELZPSc7xTspyP5ZEKPo0U4PDzoUtVSat3T6AOO2XHjGfFPk8q0D5mSI/Z jFSdOZoZGs91LuDPBFfIqTx2OVHI6fIoRJj/xKHFw+SkO9SfnnFE3cyo0M6MhYeO SgtcHHeiP17uHoYe4sEVCwWFWr2SCM1g1Uv3G2pA508zOXUOCCwe+VcCTGkNirKj tb/V942MfkgkeVrko3K2rCTIYs6m0tFzT7gwDg33XxSLe9/KxoO1BCNx8AT9nXDm SBOhugjlX1cEjkaD2DpT764+8Xpp7Gb0wmBoXwJX16YtBMN/8tB5f5fbwrWZwBMD PN98VLb90CsZGfFx8FP1w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1720364466; x=1720450866; bh=s0ElIGEZ/w5qU aY76MOIgbVu4ZRSfsnFVzsMbM7EZ3E=; b=WnFoLLfZEVJmwjRKk+FiKEytYfMh/ zLcjBgZb26/Fk5k3hgXrt+PuUr18TMyiSWQFlrFvplAOB+w+QcHyhj/hridyaTai EazQUT/UcvwOfOw2ZAPQpNZsj0aAL41W8L9WSlH2gjW3GNG6kVnalzwW5LOmeCnS jaOtxnyxsUEH0N/YBJVKFt4F1sP5NLXyqsZxYYs6ETNvcUJGiVenvRJrbXTZ783v zt8LuHXGWVRIYKwZjgdjjsFnzXy9Yd8ceVz39IukRN+7AIaQRg4ND8S1iGXJAKHG Sm6qv/WeknAUMHFbPrSlQYi2fxOeMHmlSrezeuD6oFvd5M158b3hsWNHA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehgdekhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepfeffffdtheettedvleeiheegheetvdetteehgfetiedvteeggedtjedtuddule dunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihes uggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 7 Jul 2024 11:01:03 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH 2/5] gnu: xdg-desktop-portal: Update input style. Date: Sun, 7 Jul 2024 23:00:21 +0800 Message-ID: <1d58ccc81275fe0178cc4c19b7983703850bdb16.1720364199.git.i@dan.games> X-Mailer: git-send-email 2.45.2 In-Reply-To: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> References: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update input style. Change-Id: Iec0630cd945dfcd4db67af30211cbfd4d058766d --- gnu/packages/freedesktop.scm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 2015ee46f8..28954451d5 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3005,25 +3005,25 @@ (define-public xdg-desktop-portal (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) (build-system meson-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("glib:bin" ,glib "bin") - ("gettext" ,gettext-minimal) - ("python" ,python) - ("python-dbusmock" ,python-dbusmock) - ("python-pytest" ,python-pytest) - ("python-pytest-xdist" ,python-pytest-xdist))) + (list gettext-minimal + (list glib "bin") + pkg-config + python + python-dbusmock + python-pytest + python-pytest-xdist)) (inputs - `(("bubblewrap" ,bubblewrap) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) - ("flatpak" ,flatpak) - ("fontconfig" ,fontconfig) - ("json-glib" ,json-glib) - ("libportal" ,libportal) - ("dbus" ,dbus) - ("geoclue" ,geoclue) - ("pipewire" ,pipewire) - ("fuse" ,fuse))) + (list bubblewrap + dbus + flatpak + fontconfig + fuse + gdk-pixbuf + geoclue + glib + json-glib + libportal + pipewire)) (arguments `(#:configure-flags (list "-Dsystemd=disabled") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 07 11:01:22 2024 Received: (at 71897) by debbugs.gnu.org; 7 Jul 2024 15:01:22 +0000 Received: from localhost ([127.0.0.1]:48959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTOD-0001m4-MR for submit@debbugs.gnu.org; Sun, 07 Jul 2024 11:01:22 -0400 Received: from fhigh8-smtp.messagingengine.com ([103.168.172.159]:34569) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTOC-0001lY-KR for 71897@debbugs.gnu.org; Sun, 07 Jul 2024 11:01:21 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 2961911402F3 for <71897@debbugs.gnu.org>; Sun, 7 Jul 2024 11:01:11 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Sun, 07 Jul 2024 11:01:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1720364471; x= 1720450871; bh=s2RGmZQmPtGM2/ymL5WPbqsLNMRBwWq8jMaOF/AX0zM=; b=W 8h2keQw0CPuxAc4phj4gOCGGmDf26oeHRnxD8gcwEyigCsDufpIoDVUEZ6w3Z30P m6X7QQ2qh2bW0sI5r44gLASGROGMEVHQbM1O9395JBjZd4XrKeuLtN3Sg5e0jZfz 4FeKHNEcEXYG8Q1k2XrSpHSBjNLAjtvogwGgL1QtZcxEZrZx1CZKbmbaTkYM9mzN BrH4NGdtFiazibgdIUD4ub7qnyn1ngSTen+vFPYf6JCdqVIaZcSzsztFjRVDPcp3 CP/I0msl/9jG464HtATJ5q2eI+pjH6TjsChbrptMG0FgYWRDcwRAXMX4gWObI3TD WDIF6IstN36hw3HHBlv1Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1720364471; x=1720450871; bh=s2RGmZQmPtGM2 /ymL5WPbqsLNMRBwWq8jMaOF/AX0zM=; b=hfuQ5kB+u2nTPhQ1dzx2knDjrhxkf kILhIraHEc2T35uEgBz+6IXvEGdRpWCEjfdMnTvD7JfIm1OPKGe/0WqpceSNGHzX p6CHl1NVJ/rtrjdqZVfp16Z7IooWLIIHgIIH2XQCOi7xsMkF4mWW9Mh7y3eknJck NHnpW1j3YXKeJB9Tzj3RY+uPy+dOkzw9MQMlHExEzy2gSsyb465nquEmAGVCUfU5 rjsGXm8iq3rWj1F6cjaHRo3Tqww3BZTcMUOvMp2h0N5/hlz8lfh7UD/nF3tGmPGD w4bxYrlD3fKfA6DuFt7AolDjvzJZws3Te1j2QHgkxMt7qkxi0+SQf25sA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehgdekhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepleelgffffeeigfelteduleeigfejvdetuefggfehgffgieevhfdvveeffedtle ejnecuffhomhgrihhnpehgihhtlhgrsgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 7 Jul 2024 11:01:09 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH 3/5] gnu: Add cppgir-for-telegram-desktop. Date: Sun, 7 Jul 2024 23:00:22 +0800 Message-ID: <17a452e63821067a5a3b27a6e4114404e242f290.1720364199.git.i@dan.games> X-Mailer: git-send-email 2.45.2 In-Reply-To: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> References: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/telegram.scm (cppgir-for-telegram-desktop): New variable. Change-Id: I4bb37f9ebc6cfd711ad83f29cd95bc72c0d3bf45 --- gnu/packages/telegram.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 358374a5bb..26ab27293f 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -400,6 +400,35 @@ (define cld3-for-telegram-desktop (base32 "0ayrrhfdwrf4260h9fsirkhhfrcvc3qqnh6h9wj3ixij2lq0wwqb")))) +(define cppgir-for-telegram-desktop + (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") + (revision "0")) + (package + (name "cppgir-for-telegram-desktop") + (version (git-version "2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fa9nf4yljfarihaqj5kd98yysrky7q316mh6l5b1rq39ga15k9b")))) + (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 "GObject introspection C++ binding wrapper generator") + (description "cppgir processes .gir files derived from GObject +introspection annotations into a set of C++ files defining suitable +namespaces, classes and other types that together form a C++ binding.") + (license license:expat)))) + (define-public telegram-desktop (package (name "telegram-desktop") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 07 11:01:27 2024 Received: (at 71897) by debbugs.gnu.org; 7 Jul 2024 15:01:27 +0000 Received: from localhost ([127.0.0.1]:48963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTOJ-0001mM-6Y for submit@debbugs.gnu.org; Sun, 07 Jul 2024 11:01:27 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]:43681) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTOH-0001lw-85 for 71897@debbugs.gnu.org; Sun, 07 Jul 2024 11:01:25 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfout.nyi.internal (Postfix) with ESMTP id C8403138048C for <71897@debbugs.gnu.org>; Sun, 7 Jul 2024 11:01:15 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Sun, 07 Jul 2024 11:01:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1720364475; x= 1720450875; bh=HceFDOvRxW9NelvAllyr4uysrStE1wndlYyugNsRssw=; b=A N0RbUbkMHmhbcf4LQj8oY78Zq2hb1R3gLeLDAMq3tztJyatxBZeOnPpYCevRLOxV tYM7egG4gPCGfWH9/lRgtSlrwKPHCZrygvuBEMA5Pvl7DiR0NayAetxCO3GZEshL pvDCd+mtLzTPNNQJ/yzkqFWkOwQQeqYGLH3coyTOk2/IfDxgT4TwdLRNll62cFzk yvAAlghycc543bczZ+ap1Sxg+rfuXq5lAZAtMB3VztT39iILO8q8PwKOpTdiSWpL yfOhJGGafSnK+M75m9SBnB9DxVChmMopxFup6tVeRVRaIrfxJRjRqXzY055WKwBi Cafdk6TSS+uwvaxcFbVMg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1720364475; x=1720450875; bh=HceFDOvRxW9Ne lvAllyr4uysrStE1wndlYyugNsRssw=; b=dgXefJZvvbUixq4O0D7pKmltqCHty IAxSZm6WtuTm2uRXe+KFL5QbLvxk6+Qr52ub15fr0SmHQOcijKWtUZZftiFvYfV7 w2/RdAEOqfAMUGyANS7CeJGtINZ6uu+JRlqMHQvzpt05fz7cKNr6dAElUZWopOE1 qREUaSJwTdF/UMOvNMR1WhOYFRV6orS6njUDSUJUaPmxeqOPxTAI1s8Kum0O47X8 i7iL9qMAQUcJS9nzqnAQJjYn/NrhXHZdPahHTbq4hnWin+IhCtzrA85CEGu08e1T FuinpyvBDfrI5qqh37hOCp4owyJ4OEz3iDmvCNzO/607OCBG8bFkO8iww== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehgdekhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 7 Jul 2024 11:01:14 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH 4/5] gnu: Add libprisma-for-telegram-desktop. Date: Sun, 7 Jul 2024 23:00:23 +0800 Message-ID: <80dd2fffb3b605252f0cbea2bf802e8345c15eec.1720364199.git.i@dan.games> X-Mailer: git-send-email 2.45.2 In-Reply-To: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> References: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/telegram.scm (libprisma-for-telegram-desktop): New variable. Change-Id: I855b463993654a8cad491c7b56c9581b3083f5e4 --- gnu/packages/telegram.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 26ab27293f..0a48361eb4 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -400,6 +400,18 @@ (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 "23b0d70f9709da9b38561d5706891a134d18df76"))) + (file-name + (git-file-name "libprisma-for-telegram-desktop" "5.2.3")) + (sha256 + (base32 + "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) + (define cppgir-for-telegram-desktop (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") (revision "0")) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 07 11:01:34 2024 Received: (at 71897) by debbugs.gnu.org; 7 Jul 2024 15:01:34 +0000 Received: from localhost ([127.0.0.1]:48967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTOP-0001me-J8 for submit@debbugs.gnu.org; Sun, 07 Jul 2024 11:01:34 -0400 Received: from fhigh8-smtp.messagingengine.com ([103.168.172.159]:38839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTOM-0001mF-Rt for 71897@debbugs.gnu.org; Sun, 07 Jul 2024 11:01:32 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 6AB6711402F8 for <71897@debbugs.gnu.org>; Sun, 7 Jul 2024 11:01:21 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Sun, 07 Jul 2024 11:01:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1720364481; x=1720450881; bh=ty2ayozQwCoFqCHXwXsKg+0C8F+rmGfv5CcJedEIZjA=; b= QCkufxy8IvoFtNRI8kaeDHP6Mczng+4bLMnmjbcnKV91OIFTfLTRFsOhD25runa7 yxCecXHlFkLhcCw/X42VCJPm8Me+OpKww33mXiQS2vJ6o/ZhYeWOSGciYQRZK+Gn 9IphBPS7TVYt53PQGQdIIRrCpsnW/xbSd9qAVew54cDJJmHQTg9qrSj73iamDA4B wHwgkF8/kwHWc7XvEMQ1UH6qoj/BlmVdXJuasFBIZj7irgBzf08zOd9RxswDvvLf O12qQuFqDylKNsucWDyBkOum3CA8EoLnDX7MYZU9J+7YM1nndwIrFXCZLIc5hivB zMQsDGy10jF96Ug24ZojCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1720364481; x= 1720450881; bh=ty2ayozQwCoFqCHXwXsKg+0C8F+rmGfv5CcJedEIZjA=; b=J ADeP34wyEaa5rf5wnSYdXiQKy6DnQej+RpLhc37bD6BMz0Zw2xBE0/eTSp3ItO/B +CPeowXm8zw7EzCfG9K0TnUfMMjjigh14KZHh+udZ8QpOyUgipn6FKyMnSREIUmL JZXDClH2JQeF+ax9BO4qrKxLVQ1dokoXBRGjlnfyzQchIdLB5f/a5E7YY7i4PSof uftyukInWUjPpqTI62ItvbWakU3f6YmJx64A1j8gJ3bZ00Och+gL0WeQc52iyl0J 5SDBOgZjTbWs/9Iumq7gw76QDRJ7y+1GYFurr86kZcHfanX4avE75fF6oSKCIUqP 83EbyRZ7i/komvHhjHnGQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehgdekhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecufghrlhcuvffnffculdduvddmnecujfgurhephffvuf ffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhg rghmvghsqeenucggtffrrghtthgvrhhnpeeikeeuvddtveelgeehudehleehteffhffhff fhvdevgeevkeehhfffieeuieegieenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhk ihhtfigrrhgvrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 7 Jul 2024 11:01:17 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH 5/5] gnu: telegram-desktop: Update to 5.2.3. Date: Sun, 7 Jul 2024 23:00:24 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> References: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. * gnu/local.mk (dist_patch_DATA): register them. * gnu/packages/telegram.scm: (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)[origin]: Add patches to unbundle gsl and cppgir. (libprisma-for-telegram-desktop): Use %telegram-version. (telegram-desktop): Update to 5.2.3. [#:phases]: Add libprisma-for-telegram-desktop. : New phase. : New phase. [native-inputs]: Add xdg-desktop-portal. [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite and gobject-introspection. Change-Id: I78df3434a2cd04afc54107b7fecd5e5a8df85564 --- gnu/local.mk | 2 + .../telegram-desktop-unbundle-cppgir.patch | 95 +++++++++++++++++++ .../telegram-desktop-unbundle-gsl.patch | 31 ++++++ gnu/packages/telegram.scm | 90 +++++++++++------- 4 files changed, 186 insertions(+), 32 deletions(-) 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 bb53b08b8e..396cd72fcf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2135,6 +2135,8 @@ 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-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-unbundle-cppgir.patch b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch new file mode 100644 index 0000000000..a24dbe25bb --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch @@ -0,0 +1,95 @@ +From a5c42e07ae223d440ff11347e0cf1fd58fd383df Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 1/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/CMakeLists.txt | 4 +++- + external/glib/generate_cppgir.cmake | 7 ++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt +index 3c6fe4be..c862705f 100644 +--- a/external/glib/CMakeLists.txt ++++ b/external/glib/CMakeLists.txt +@@ -13,9 +13,11 @@ function(add_cppgir) # isolate scope + set(BUILD_EXAMPLES OFF) + add_subdirectory(cppgir EXCLUDE_FROM_ALL) + endfunction() +-add_cppgir() + + include(generate_cppgir.cmake) ++if (NOT CppGir_FOUND) ++ add_cppgir() ++endif() + generate_cppgir(external_glib Gio-2.0) + + find_package(PkgConfig REQUIRED) +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index c15d3f9e..9b0a5ac8 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 2.0) ++ + function(generate_cppgir target_name gir) + set(cppgir_loc ${cmake_helpers_loc}/external/glib/cppgir) + +@@ -17,6 +19,9 @@ function(generate_cppgir target_name gir) + ${cppgir_loc}/data/cppgir.ignore + ${cppgir_loc}/data/cppgir_unix.ignore + ) ++ if (CppGir_FOUND) ++ set(ignore_files) # rely on default ignore list ++ endif() + + set(gir_path) + if (IS_ABSOLUTE "${gir}") +@@ -33,7 +38,7 @@ function(generate_cppgir target_name gir) + --class + --class-full + --expected +- --ignore ++ "$<$:--ignore>" + "$" + --output + ${gen_dst} + +From eed39522952c15f448c54290454806dd011c4996 Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 2/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/generate_cppgir.cmake | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index 9b0a5ac8..2ad82277 100644 +--- a/external/glib/generate_cppgir.cmake ++++ b/external/glib/generate_cppgir.cmake +@@ -15,11 +15,12 @@ function(generate_cppgir target_name gir) + + set(gen_timestamp ${gen_dst}/${target_name}_cppgir.timestamp) + +- set(ignore_files +- ${cppgir_loc}/data/cppgir.ignore +- ${cppgir_loc}/data/cppgir_unix.ignore +- ) +- if (CppGir_FOUND) ++ if (NOT CppGir_FOUND) ++ set(ignore_files ++ ${cppgir_loc}/data/cppgir.ignore ++ ${cppgir_loc}/data/cppgir_unix.ignore ++ ) ++ else() + set(ignore_files) # rely on default ignore list + endif() + 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..f89d326a5c --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch @@ -0,0 +1,31 @@ +From a3ac6df0441b4caca28b1df87febc420e18942ce Mon Sep 17 00:00:00 2001 +From: Zephyr Lykos +Date: Mon, 23 Oct 2023 15:55:24 +0800 +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 8eaf19c5..344f9488 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) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 0a48361eb4..f4bba8cae9 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2023 Lu Hui ;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; Copyright © 2024 Ricardo Wurmus +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,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) @@ -54,6 +56,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages lua) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -82,11 +85,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 "5.2.3") (define libyuv-for-telegram-desktop - (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") - (revision "2439")) + (let ((commit "04821d1e7d60845525e8db55c7bcd41ef5be9406") + (revision "2440")) (origin (method git-fetch) (uri (git-reference @@ -97,67 +100,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 "4a4bc4cd34b3ade038541a2b8b2c79f05393d67b"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) + (patches + ;; https://github.com/desktop-app/cmake_helpers/pull/320 + ;; https://github.com/desktop-app/cmake_helpers/pull/305 + (search-patches "telegram-desktop-unbundle-gsl.patch" + "telegram-desktop-unbundle-cppgir.patch")) (sha256 (base32 - "0y96mvzs113zh8bdw1h3i6l0pgwg93rigrday8kfdg4magz686k6")))) + "129m2wy3jyrcngsln46k7cl00jjg30kj9kdfil7aq9c23z3iqvm8")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "1a969faa0afb29d53af03e530775eccdfb8433f1"))) + (commit "0af136124083369073b8fdaf45f0816fd2b10bad"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1xmw8dfm51p5g20rlmzqnr72a14ngyxwq09an8clf1v5s6mmwvak")))) + "057bwn9smrgnyfb1vraf50ihbkhjc4d72msl7vnbqc4h5sg8dav9")))) (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 "1a50fd2300da3198e751a22bf728d33822180e15"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83")))) + "1hyhqz6mwdmcs6wcglz3hwlzl1n04lfi22d3n75ad40qfc9kh3ci")))) (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 @@ -188,24 +196,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 "0b7622ff38778e9cd03d3997de59351973480a1f"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "147xbbcza5q4wcdipk5jplajzkc48971kg2s7qv5jlz33sxkw1lq")))) + "0s9fjxpxxvj1xgzg3sfw6079blgmdvbb5cy6wb921sqaqwf52j6x")))) (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 "0971b69ca90f1697ef81276d9820dcd6d26de4ac"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) + "0ihbh1ajns0sf42h9992hnawwjr1n439sgb0g4zirn2bj5i1zbdv")))) (define lib-tl-for-telegram-desktop (origin @@ -224,52 +232,52 @@ (define lib-ui-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "37531086ec21a8569deddedb11b402f8a3157b90"))) + (commit "96be2a6b72f0405a9c01407148303fba2dab101c"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0")))) + "0y989q2xs5hjm7dg7rpgyqlalf8sjklhg0v26nnzfgabl8248bgy")))) (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "b68a95ad4d1ae9a1827671100a7fd76cbe448c3f"))) + (commit "eb9496540356945e2c9fb700bcfa51444fd36f41"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1c8jwdnn26n13yp0rp0l71q6xlxa6wp3cspbm3pnghw964jwgp3z")))) + "0nqlzb02b39ywjmazx30y43nalvc3ypkqjh5zvs35gnvm9x2hy43")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "f632fc84cbc62ae8abbbd05f81d472757a337c11"))) + (commit "363db4e49a0b78e5dd08bd922e09cf8810318c09"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i")))) + "1l84rlm4cb56q87k5036n4c0g49f6a5qlhrjc5wn57s56wphvhqn")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "2e2797648aac2588e7fe479c2e8b4455ec65c5e6"))) + (commit "b9fa8b84d8abe741183f157218ac038c596a54a5"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) + "1swni7xw5l0q376b6rnf9h93arzjqm9rkv7g6hz67742lf9a0x9z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") - (revision "389")) + (let ((commit "c9cc4390ab951f2cbc103ff783a11f398b27660b") + (revision "399")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -285,7 +293,7 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) + (base32 "0x2hjliiapb9kacbg8fwkz7g09c9k8dc77xxycjh5kmm1fc2i6dd")) (patches (search-patches ;; https://github.com/desktop-app/tg_owt/pull/123 @@ -407,7 +415,7 @@ (define libprisma-for-telegram-desktop (url "https://github.com/desktop-app/libprisma") (commit "23b0d70f9709da9b38561d5706891a134d18df76"))) (file-name - (git-file-name "libprisma-for-telegram-desktop" "5.2.3")) + (git-file-name "libprisma-for-telegram-desktop" %telegram-version)) (sha256 (base32 "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) @@ -456,7 +464,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) + (base32 "1jwm8irjx5yfzd9a94f5dy4y9v5as0an8m83hlal6czlqbi5v4sm")) (patches (search-patches ;; https://github.com/telegramdesktop/tdesktop/pull/24126 @@ -522,7 +530,20 @@ (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 'unpack-additional-sources 'use-system-xdg-desktop-portal + (lambda _ + (substitute* (list "Telegram/CMakeLists.txt" + "Telegram/lib_base/CMakeLists.txt") + (("\\$\\{third_party_loc\\}/xdg-desktop-portal/data") + (string-append #$(this-package-native-input "xdg-desktop-portal") + "/share/dbus-1/interfaces"))))) (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 @@ -531,17 +552,22 @@ (define-public telegram-desktop (list `(,glib "bin") `(,gtk+ "bin") pkg-config - python-wrapper)) + python-wrapper + xdg-desktop-portal)) (inputs (list abseil-cpp-cxxstd17 alsa-lib + boost c++-gsl crc32c + cppgir-for-telegram-desktop + expected-lite fcitx-qt5 fcitx5-qt ffmpeg glib glibmm-2.76 + gobject-introspection gtk+ hime hunspell -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 08 22:15:32 2024 Received: (at 71897) by debbugs.gnu.org; 9 Jul 2024 02:15:32 +0000 Received: from localhost ([127.0.0.1]:51738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR0OC-0002FX-JN for submit@debbugs.gnu.org; Mon, 08 Jul 2024 22:15:32 -0400 Received: from mail-qv1-f45.google.com ([209.85.219.45]:57597) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR0O9-0002FJ-MD for 71897@debbugs.gnu.org; Mon, 08 Jul 2024 22:15:31 -0400 Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-6b5da2730efso28153406d6.2 for <71897@debbugs.gnu.org>; Mon, 08 Jul 2024 19:15:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720491259; x=1721096059; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=/nBuwWkgvnk+fMQPOG1ZtpTMHT8XU2o8+FNKEto7FAM=; b=FAXOusBpDOZ+agTaTJOkglJmkHz2KF0RPCdzSsNNKNdoWkWN6AGEPUA+rJm/SGgm/t 92cXfBbpNw9TSUSvHj7zBCuVrrKbIqYS9Fog1565oGEC7KkfCwB1WC299SsG2syp8E6q I90pPkCTeQxsFXSk6jaOMtmdLtKNW/1YmF3RexVmPY9yzvGHpaPUsRJJM/AZkdynxq1a HN/ASmnL6luorb26ERrlZBxylLcJa/g9p/Bq+GBfb0xawXbsl7Bnea7exV7DIagmLtoO YP3LfBvZ5h8FK5BlmrdHWXLgC//8bmFbi1qz7nEwOsmX5d59pVb/WG4Tdb3vYt10nPO/ DdXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720491259; x=1721096059; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/nBuwWkgvnk+fMQPOG1ZtpTMHT8XU2o8+FNKEto7FAM=; b=G3E6kK6cne6GCUzWcMHulWkrYlnZfV5kUIPabe+b8ezOSYou0oP/A7EvM7iy5hyxuf UGNqTvDbaz6JB6L9VgC9dbRAJhhmhOB4tsjvfU+Dz4nPhBLcqwHex6RVxLosMgxWKrdk FxYskXoCERtmSVfUYI3VJr9cSdp/yoAYuGy9mMdPyQGc1fGk7su6OrVK6PR34GdxOiiu TPm3s2Io+qKdq1AKgXGf5kcDB2dINHTIR55NTRGT637ZiKto3S9rEFlS6gYY+TlVZza+ S2KFqitcxXiX19XaSUD2NOYotcNasWQFiTcGSKFf4zLgzSrpwMDgW3zqboZqKh4S8g6q lPCQ== X-Gm-Message-State: AOJu0YzjVEyzk6r7unJUqESUAjIfxxJXIv4tVCvqUnU4DdO6PPkTC/p1 up0cU4LO+xjF3OKlmGg4+1DzYYwPrD2zTlMd1BOCPOpoW6lCoJ3a X-Google-Smtp-Source: AGHT+IHMYjqcefqioZVHfzMM+Qv1A072ibL41pON46OO2rV5ZxWU/CW7SiBrKJJnzT3T7zVxRrNG8g== X-Received: by 2002:a05:6214:ac9:b0:6b5:ea99:bdcb with SMTP id 6a1803df08f44-6b61c1c4107mr17879076d6.42.1720491258688; Mon, 08 Jul 2024 19:14:18 -0700 (PDT) Received: from hurd (dsl-205-236-230-124.b2b2c.ca. [205.236.230.124]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b61ba77767sm4817916d6.95.2024.07.08.19.14.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 19:14:18 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH 1/5] gnu: xdg-desktop-portal: Update to 1.18.4. In-Reply-To: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> (dan's message of "Sun, 7 Jul 2024 23:00:20 +0800") References: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@dan.games> <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> Date: Mon, 08 Jul 2024 22:14:17 -0400 Message-ID: <87sewjxqfa.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) dan writes: > * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.18.4. > [patches]: Disable portal tests. > [native-inputs]: Remove autoconf, automake, libtool and which. Add python, > python-dbusmock, python-pytest and python-pytest-xdist. > [inputs]: Add bubblewrap. > [phases]<#:configure-flags>: Update flags to meson options. > > Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 Reviewed-by: Maxim Cournoyer -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 08 22:16:07 2024 Received: (at 71897) by debbugs.gnu.org; 9 Jul 2024 02:16:07 +0000 Received: from localhost ([127.0.0.1]:51742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR0Ok-0002Gl-Ur for submit@debbugs.gnu.org; Mon, 08 Jul 2024 22:16:07 -0400 Received: from mail-qk1-f170.google.com ([209.85.222.170]:58430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR0Oi-0002G9-Ul for 71897@debbugs.gnu.org; Mon, 08 Jul 2024 22:16:05 -0400 Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-79f178351d4so71105985a.0 for <71897@debbugs.gnu.org>; Mon, 08 Jul 2024 19:15:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720491294; x=1721096094; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=gROmyzansMc7TAJXea+40MnNKcwGLxSUXvAAKd4zoKw=; b=MIh40vgqHu7xhFuFWrV/VBgusFNEW1CjwK3rcHvGmjHszgX/1hazM0ubHZa3zG8cCd I+uAgkGxjVvV7bTjw1UDtQ7c9fbbiGe8tvebqf5xQVPe4IKq/mpzfIv8UGzNcBJg4/cP x3t4RUkMvXj111Rr9FLYuoxxV9F2xC692jd/ISkprEzm3PRunlxll2n61AfjEmIbPKlV F6XTFwpXblfn4+DeTzZnJvapsP5EpbPx/KAXCV1W/0ZTXUXj8JjhmkWJIevxFbY4bMqm 00D08h+CxsLtR6veofC2IgryDnB0VLrSXY07oAmP0ri+ivIsbeRAgDxPO7WF3xZbX4Ch i6ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720491294; x=1721096094; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=gROmyzansMc7TAJXea+40MnNKcwGLxSUXvAAKd4zoKw=; b=nvhEcrzwI1P/gVLz6lkdpjw2jd1MXA6OGOV8CK4mVgpC0N4qkMpU5Bnou0AoSZIFVL x5sOWbNejVMUIdvUMuFjCGgoNM+wm3xRYtrBLZovvfNHy8M3ndTVAJ3Dmfv4lvsZTF5d MbhGeDMJys3J5R0yEdJavvLfAs1xHEOM1DXhXqaNKEO0EoUrqB92NYmqgOAD481JTXIA XQMjTlpWxV6OPD+5WlsWzkXKebWhNRv2Z3a8VgN/XZLltFSQXONzlFbtpqgd469AEToG iSO2Ca/YXYACRNnbFv6LPr1KqBbUIPJ6RFtpBZLKA15FgSyRo69LinRozoljP3Dh0Pd/ i1Lw== X-Gm-Message-State: AOJu0YzG13z0dg8PDEA6N/hD0R5a/jJANpi5YtuEPambyfamlzZDB7Hu F+IbAJNXtvDaNprUlHa28wsZeEVCJ9x39PF/skQLZ5ealWAOI8tr X-Google-Smtp-Source: AGHT+IE0QQtsc3x0w8s1LlMctO8wl8ZkKIPXCe61G+tRXWlMMYeBhhvztWBVtmef0/CtbiWbDsLh6A== X-Received: by 2002:a05:6214:20ac:b0:6b5:9b3d:ede6 with SMTP id 6a1803df08f44-6b61c21a1d2mr17771216d6.56.1720491293920; Mon, 08 Jul 2024 19:14:53 -0700 (PDT) Received: from hurd (dsl-205-236-230-124.b2b2c.ca. [205.236.230.124]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b61ba77767sm4820856d6.95.2024.07.08.19.14.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 19:14:53 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH 2/5] gnu: xdg-desktop-portal: Update input style. In-Reply-To: <1d58ccc81275fe0178cc4c19b7983703850bdb16.1720364199.git.i@dan.games> (dan's message of "Sun, 7 Jul 2024 23:00:21 +0800") References: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> <1d58ccc81275fe0178cc4c19b7983703850bdb16.1720364199.git.i@dan.games> Date: Mon, 08 Jul 2024 22:14:52 -0400 Message-ID: <87o777xqeb.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) dan writes: > * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update input style. > > Change-Id: Iec0630cd945dfcd4db67af30211cbfd4d058766d Reviewed-by: Maxim Cournoyer -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 08 22:26:24 2024 Received: (at 71897) by debbugs.gnu.org; 9 Jul 2024 02:26:24 +0000 Received: from localhost ([127.0.0.1]:51746 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR0Yi-0002X9-5O for submit@debbugs.gnu.org; Mon, 08 Jul 2024 22:26:24 -0400 Received: from mail-qv1-f44.google.com ([209.85.219.44]:42346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR0Yf-0002Wv-2f for 71897@debbugs.gnu.org; Mon, 08 Jul 2024 22:26:22 -0400 Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-6b5dc36b896so33178676d6.1 for <71897@debbugs.gnu.org>; Mon, 08 Jul 2024 19:26:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720491910; x=1721096710; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=s5nRABuWTAGGyL6LpRg3Dqu3cc2fTKJvCLlKUPtK9dw=; b=I8L7LBf7i1KoVRIyVJuzRw1EWgORGBA4FmfVY3Gp0oLA78Dur+oqRiwtSG8CD9QoHt EFX7eQnBVu+HRxCKSujhbGcG83F/GRRFt2BpZ7ULyw7nP4udmkwFTg+WdHia1PDlz2br Rmdbxkk42HqDKcAt8fBBkXNA7Px6928LPd5RB2y44Id/iZfEa5TVphPrNcDmwCqLZGPZ wDCuXCyMvz8YdUx1QVQiPJ8oR/k47V//kbtWn1A9p4fCgdC56Gwi7mtHk37UCNB0D2/k 6nVXO9yzHrZwLScPdO65l7wkcJ4WsfpsyYp0wOunkRfVQUV3JZzFt6Pvlh4otniZtREP QNzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720491910; x=1721096710; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=s5nRABuWTAGGyL6LpRg3Dqu3cc2fTKJvCLlKUPtK9dw=; b=UlYjJ7wJjnPAjaTOL1RN5yZHPTJyhzOUXJfS5/an5DbITk2pQ1JVS67k5+6zzI7zzg Ql58s3+fXyf3U9Q1fpV8snKEnEOmAABKbxOxKlW6q+l0PlMEndThom8u31hJ5xowy1hn GXD8VGI++Lbd2X9qvS/tWcxpdQyXqd2nbInV9W8CWtPCglM4HftYjNTim7mlVKgXlXj2 4uqSD25JJAhBAL0IlOOCYf9f2GtjN25BdPi4trOS9CpWNsCrC1tdrDPi7rLQy9EdUTt2 rWwvCMkFORpdnPsk2737lei68Rn6NliowguAkyFqktNmRQnFA/8iiYGW5KUK9+SpUBca pglg== X-Gm-Message-State: AOJu0YxIfayNjQcVlv32KIvYXmXX0xbikdaNMT7f2g8X2BGe23OlTKrC Mx0hB8yoNvGq8yHmdOrXO5s58jDBoRGyhAExaieFAU1S7nEp1gvXp+sdsQ== X-Google-Smtp-Source: AGHT+IEXupVpxpN0joTJ0qBN84CKusvk1rnVEiilLDHX+y+nVIjz9npYEA1cogmdcYaZxLcTja1qSg== X-Received: by 2002:a0c:e606:0:b0:6b5:1cea:649d with SMTP id 6a1803df08f44-6b61d7b9bc0mr19000206d6.11.1720491910122; Mon, 08 Jul 2024 19:25:10 -0700 (PDT) Received: from hurd (dsl-205-236-230-124.b2b2c.ca. [205.236.230.124]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b61b9c8312sm4927636d6.1.2024.07.08.19.25.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 19:25:09 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH 3/5] gnu: Add cppgir-for-telegram-desktop. In-Reply-To: <17a452e63821067a5a3b27a6e4114404e242f290.1720364199.git.i@dan.games> (dan's message of "Sun, 7 Jul 2024 23:00:22 +0800") References: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> <17a452e63821067a5a3b27a6e4114404e242f290.1720364199.git.i@dan.games> Date: Mon, 08 Jul 2024 22:25:08 -0400 Message-ID: <87h6czxpx7.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Dan, dan writes: > * gnu/packages/telegram.scm (cppgir-for-telegram-desktop): New variable. > > Change-Id: I4bb37f9ebc6cfd711ad83f29cd95bc72c0d3bf45 > --- > gnu/packages/telegram.scm | 29 +++++++++++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm > index 358374a5bb..26ab27293f 100644 > --- a/gnu/packages/telegram.scm > +++ b/gnu/packages/telegram.scm > @@ -400,6 +400,35 @@ (define cld3-for-telegram-desktop > (base32 > "0ayrrhfdwrf4260h9fsirkhhfrcvc3qqnh6h9wj3ixij2lq0wwqb")))) > > +(define cppgir-for-telegram-desktop > + (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") > + (revision "0")) > + (package > + (name "cppgir-for-telegram-desktop") > + (version (git-version "2.0" revision commit)) > + (source > + (origin > + (method git-fetch) > + (uri > + (git-reference > + (url "https://gitlab.com/mnauw/cppgir") > + (commit commit))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "1fa9nf4yljfarihaqj5kd98yysrky7q316mh6l5b1rq39ga15k9b")))) > + (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 "GObject introspection C++ binding wrapper generator") > + (description "cppgir processes .gir files derived from GObject > +introspection annotations into a set of C++ files defining suitable > +namespaces, classes and other types that together form a C++ binding.") > + (license license:expat)))) That'd be reasonable as a new package if it was very tightly developed with telegram, but it doesn't seem to be the case. I'd prefer having it in (gnu packages glib). What is the "compilation error" you had mentioned when using version 2.0? Does the cppgir release fails to compile itself, or is it telegram that then doesn't build using that one? If the later, I'd define, in (gnu packages glib) --8<---------------cut here---------------start------------->8--- (define-public cppgir [...] "original package at version 2.0") (define-public cppgir-for-telegram-desktop (package (inherit cppgir) (source ... (using latest or telegram-specific (?) commit)))) --8<---------------cut here---------------end--------------->8--- Sorry for the back and forth, we're narrowing down on the perfect submission; keep it up. Don't forget to use -v5 for your next patches submission :-), and ensure 'guix lint' is happy with all the packages. Thank you for your efforts! Keep it up. -- Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 08 22:30:50 2024 Received: (at 71897) by debbugs.gnu.org; 9 Jul 2024 02:30:50 +0000 Received: from localhost ([127.0.0.1]:51751 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR0cz-0002fB-Uf for submit@debbugs.gnu.org; Mon, 08 Jul 2024 22:30:50 -0400 Received: from mail-qk1-f179.google.com ([209.85.222.179]:47417) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR0cx-0002f3-PY for 71897@debbugs.gnu.org; Mon, 08 Jul 2024 22:30:48 -0400 Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-79ef7635818so241823185a.3 for <71897@debbugs.gnu.org>; Mon, 08 Jul 2024 19:30:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720492182; x=1721096982; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=fIQEfAlhFQjYRWgLusztmur2d4WbCHF3rKrBZcuh83Q=; b=Ka0kubvGHlqJwd8JCbbT1mZ3/3FwHX27UxKol2OyuxtEkzGsJN+5IsL39zdKSaZxXp rzXL1ajeW1bmW7yzBy9zxTrAkgemdCHE1mSVR608uNZgz5F7s30gH604lr0V9fZ09nRi j+4pLV0P9CaVTX6c93Fnhf089rPtmCfKwLLoEyfsouzSSYRVtfIZ8adgxf64qN7ApKvY l6mC8lU2J9hS6wZOOz6AlaSXSrUINNZKz++75lNCfEh3nN6KY52UKi/qNBHMVZ5+HIYh UZtiCITzHaWDTYkDyVSBhjEjONCIF0ktULbBpfOhU6fVZEf3O6AIb5JbIjPKXyX2WSmS OHYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720492182; x=1721096982; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=fIQEfAlhFQjYRWgLusztmur2d4WbCHF3rKrBZcuh83Q=; b=wBJp7CMi2BzAExdacSNeeXfIFqgT+Rkg0kDZHgmoFlgsMN8h22x6uookRyGLzG0XWS +kZUPdh8AcsKKRy+qVRJqhH8Jcpe+dzhWRhtILHgd/yQn54cEW8yYRKVPHQHi/lInbH8 7apu2PfyvhQcFLAenFQJV21LpzKduoWCta7B6fii/DXPXJTcu3n14KwJL4fRX45q21PF PJNwkq19s+FZWeXBKlPgc7xrRxLEPTyaL/ln5M1GMXxha4GPb9nnqP9yuYQFGe/cmUbA EBiJ6+XdFpLY5qPNuhVrL0WfgHFnOarcVWZC9szJ4eVqY2+W+nQcaoxERa1g2FpoU1c/ mFkg== X-Gm-Message-State: AOJu0YxYPY/ibOcFSiLJO0X0nCuvaS3xHoJ001+2IJIHfoCs3IQpfvHH 31iGdwAtBY4aW2GTzE8ZfvCukZgkk+JodX2OTqZhCZRNX12/T2qO X-Google-Smtp-Source: AGHT+IFHOcVOG3fXjQRH9Zn8XtP+9TZLjzqk6NH8K2H3wdAws09+QSc+Fy1ivhgsFLs6AiNT8nwLgA== X-Received: by 2002:ae9:f70b:0:b0:79f:665:163e with SMTP id af79cd13be357-79f19a70e43mr153193785a.17.1720492181910; Mon, 08 Jul 2024 19:29:41 -0700 (PDT) Received: from hurd (dsl-205-236-230-124.b2b2c.ca. [205.236.230.124]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79f1900f2bcsm50711885a.32.2024.07.08.19.29.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 19:29:41 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH 4/5] gnu: Add libprisma-for-telegram-desktop. In-Reply-To: <80dd2fffb3b605252f0cbea2bf802e8345c15eec.1720364199.git.i@dan.games> (dan's message of "Sun, 7 Jul 2024 23:00:23 +0800") References: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> <80dd2fffb3b605252f0cbea2bf802e8345c15eec.1720364199.git.i@dan.games> Date: Mon, 08 Jul 2024 22:29:40 -0400 Message-ID: <87cynnxppn.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, dan writes: > * gnu/packages/telegram.scm (libprisma-for-telegram-desktop): New variable. > > Change-Id: I855b463993654a8cad491c7b56c9581b3083f5e4 > --- > gnu/packages/telegram.scm | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm > index 26ab27293f..0a48361eb4 100644 > --- a/gnu/packages/telegram.scm > +++ b/gnu/packages/telegram.scm > @@ -400,6 +400,18 @@ (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 "23b0d70f9709da9b38561d5706891a134d18df76"))) > + (file-name > + (git-file-name "libprisma-for-telegram-desktop" "5.2.3")) > + (sha256 > + (base32 > + "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) > + So this is built as part of telegram? If this doesn't have any proper build system to be built separately and linked, or if telegram lacks such a feature in its own build system (I like to report such feature request for that to upstream myself), another perhaps more maintainable strategy would be to use recursive? #t on the git-reference to clone these, and delete in a source snippet the submodules we don't want to have. Otherwise, OK! -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 08 22:36:36 2024 Received: (at 71897) by debbugs.gnu.org; 9 Jul 2024 02:36:36 +0000 Received: from localhost ([127.0.0.1]:51759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR0ia-0002nq-97 for submit@debbugs.gnu.org; Mon, 08 Jul 2024 22:36:36 -0400 Received: from mail-vk1-f175.google.com ([209.85.221.175]:60798) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR0iX-0002nZ-R7 for 71897@debbugs.gnu.org; Mon, 08 Jul 2024 22:36:34 -0400 Received: by mail-vk1-f175.google.com with SMTP id 71dfb90a1353d-4f2e1093abeso1759532e0c.1 for <71897@debbugs.gnu.org>; Mon, 08 Jul 2024 19:36:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720492523; x=1721097323; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=IYyiYXQX8nAHVkzBbjRW0G8ZZC2H7UE1BpZsTMJDIkM=; b=CAK3OKkln0nEGGMKzhVqNg1ndbBZvaxW+JkGZHThrH7l3I4sSX5RUsOyyTNwqcpOVL AROzCODkGVXbmLAIedRkgG+KsafaGtKVo0zeORrKCoLhmDReBzEjcxoUEOoXZaqh7Tg/ W5e6mkWfHVRNp6BWOryHnijZqNoBzxtafkNToD+dvbsOtnaG+wuHidj8dzjKEqXq8UWc 6LNjukPvL9LOjEOBggu2Nget4XaN4gV5MSd4NNY1BdhdnRhthObWITwLNT+Q/BzH0lfA kzRcd27/4qhFV7oUVDp4MHVSsBlS/mJVcmSd5ZrTiSV1ov5ZwAgWX9SrUx4CsW/9+ZKQ f7zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720492523; x=1721097323; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=IYyiYXQX8nAHVkzBbjRW0G8ZZC2H7UE1BpZsTMJDIkM=; b=PMsN4B8RmrAKR6ASIATY6vjuLgQ70u/Vv2/mkL/Jf0BAVmkdOV5aam5/Sp05vSkT/Z 8K2jHAr/BOEeKdOTD5WwwOeqvMCBLm2I/UmeKBRAg4IEv4UtENhywC4FiAFaXN0ZOKAs B9xLi+byVQc8pZNimgv+GBvasicRmsBTDwiBjt284svMbw2enXgFZ6W1jppY7It9+GSS iyGa4xaYrpkONJzLwvco9JnrWk+QqZIu86lycLpadb0ZIpPm7V+dAekDJwIcg9Vdu61y 8lpX8W5gwER8DmF6+IuQEHYgfVbr6LrEpQIUHixeTYT8ICgo00O1zD68FTsy6krQhrD0 fFFQ== X-Gm-Message-State: AOJu0YxSLxeckhgocIKUt/+MaLkLmqLAqH0yE6MeX61hOYrfVJQYaLTP w7Z6vPtDmrA4tbCLr7EXzHUb63jijX6DLUOu7sDODTymZ8TZ61D0 X-Google-Smtp-Source: AGHT+IH/LK7mywQoL65JKdd9clS8JDSxRwVZnyLaMWY9dUibsgzAS8VnaHOhhAnqOaWf1Z8mS3uSWw== X-Received: by 2002:a05:6122:910:b0:4f2:ebd9:8e12 with SMTP id 71dfb90a1353d-4f33f24fa48mr1725088e0c.5.1720492522793; Mon, 08 Jul 2024 19:35:22 -0700 (PDT) Received: from hurd (dsl-205-236-230-124.b2b2c.ca. [205.236.230.124]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79f19087260sm50483085a.73.2024.07.08.19.35.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 19:35:22 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH 5/5] gnu: telegram-desktop: Update to 5.2.3. In-Reply-To: (dan's message of "Sun, 7 Jul 2024 23:00:24 +0800") References: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> Date: Mon, 08 Jul 2024 22:35:21 -0400 Message-ID: <878qybxpg6.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello! dan writes: > * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. > * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. > * gnu/local.mk (dist_patch_DATA): register them. Nitpick: "Register", capitalized. > * gnu/packages/telegram.scm: > (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)[origin]: Add patches to unbundle gsl and > cppgir. > (libprisma-for-telegram-desktop): Use %telegram-version. > (telegram-desktop): Update to 5.2.3. > [#:phases]: Add libprisma-for-telegram-desktop. > : New phase. > : New phase. > [native-inputs]: Add xdg-desktop-portal. Nitpick: GNU ChangeLog doesn't uses hanging indents. > [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite and > gobject-introspection. [...] > diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm [...] > -(define %telegram-version "4.8.1") > +(define %telegram-version "5.2.3") [...] > (search-patches > ;; https://github.com/telegramdesktop/tdesktop/pull/24126 > @@ -522,7 +530,20 @@ (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 'unpack-additional-sources 'use-system-xdg-desktop-portal > + (lambda _ > + (substitute* (list "Telegram/CMakeLists.txt" > + "Telegram/lib_base/CMakeLists.txt") > + (("\\$\\{third_party_loc\\}/xdg-desktop-portal/data") > + (string-append #$(this-package-native-input "xdg-desktop-portal") > + "/share/dbus-1/interfaces"))))) > (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 > @@ -531,17 +552,22 @@ (define-public telegram-desktop > (list `(,glib "bin") > `(,gtk+ "bin") > pkg-config > - python-wrapper)) > + python-wrapper > + xdg-desktop-portal)) > (inputs > (list abseil-cpp-cxxstd17 > alsa-lib > + boost > c++-gsl > crc32c > + cppgir-for-telegram-desktop Nitpick: should be listed alphabetically before the crc32c input. > + expected-lite > fcitx-qt5 > fcitx5-qt > ffmpeg > glib > glibmm-2.76 > + gobject-introspection > gtk+ > hime > hunspell Otherwise LGTM! Feel free to adjust the little things above in a v5. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 08 23:08:19 2024 Received: (at 71897) by debbugs.gnu.org; 9 Jul 2024 03:08:19 +0000 Received: from localhost ([127.0.0.1]:51832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR1DG-0003cm-TV for submit@debbugs.gnu.org; Mon, 08 Jul 2024 23:08:19 -0400 Received: from fout2-smtp.messagingengine.com ([103.168.172.145]:47275) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR1DD-0003cV-Mk for 71897@debbugs.gnu.org; Mon, 08 Jul 2024 23:08:17 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfout.nyi.internal (Postfix) with ESMTP id D9BE21381913; Mon, 8 Jul 2024 23:08:04 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 08 Jul 2024 23:08:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1720494484; x=1720580884; bh=GXBYqf49+gGwKbQ8KEb4CDRJH2poi7sRNpSyc3OEcOY=; b= PELOWpn7EIxrZlEBodIOP+asVoytNwDXZ6Dj4SF3t593wDj5YspnpI/a/RpvcCN4 +KFy/CeUPK5y7cdmSupPgP4k+8kwkCpJEC3dTJSEPEXQuQbRRgqTeCi90jkL4YNa emCc1VqmWED/k82dGGZYYxCMZdR619oNFMXH4QttFywf98Z8hyKqeecFC8Iicf0P +mDpNfmL58+SrerDfKpjYrRa2B+TY2wwiaeMOTbIM+8JPPS1WzO1vPcj+zJCNTW2 qOEJG4USL+cTz8RJS4O4x/Yzau1JKOWJnFr9QxNoAAWV5s79MMxeuRhySeaRqkA2 fxl4bRocpkcJrrNUIWkKdw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1720494484; x= 1720580884; bh=GXBYqf49+gGwKbQ8KEb4CDRJH2poi7sRNpSyc3OEcOY=; b=P q/SweGZCPZ94ZQIak9tNlDsMt4VGCF/C43yl9oQPpEAL8r2RWLgw6E/3Djh5gD2l Ing/2NfEgklNSdiQpCcOmw+OgQnOxUCEYF69dwRfi9/zJ17LZFBx5rbMfI8DbZOL VmLf3TESWYUYO5jFUYAKU4qqjavGEPCPlgomnmI2yCu644Wn83yC9mRdA8r7c5XS 440Wodl7qJHpdF831zSFOCsKJHl8efZPafz6GjihSvDKwowWdUU3MWN7uKf5F1pB Onht+zW060wY8ypGLyHnClhtKRqIgJfmzm4PWWk2npv9qLcnvHZqfDUhGb+yEScN 2ahftkcmJ4zf2vBr6VwvA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdekgdeiiecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefkffggfgfuvfevfhfhjggtgfesthejredttddvjeenucfhrhhomhepuggrnhcu oehisegurghnrdhgrghmvghsqeenucggtffrrghtthgvrhhnpefgudeffeeiuddvtddule eludevleehkeeuhedvfffgffdthfejffegtdduhfegkeenucffohhmrghinhepghhithhl rggsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 8 Jul 2024 23:07:56 -0400 (EDT) Message-ID: <82e92de9-50ed-4f7b-91d7-253c41da5965@dan.games> Date: Tue, 9 Jul 2024 11:07:54 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [bug#71897] [PATCH 3/5] gnu: Add cppgir-for-telegram-desktop. To: Maxim Cournoyer References: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> <17a452e63821067a5a3b27a6e4114404e242f290.1720364199.git.i@dan.games> <87h6czxpx7.fsf@gmail.com> Content-Language: en-US From: dan In-Reply-To: <87h6czxpx7.fsf@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 Cc: Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On 7/9/2024 10:25 AM, Maxim Cournoyer wrote: > Hi Dan, > > dan writes: > >> * gnu/packages/telegram.scm (cppgir-for-telegram-desktop): New variable. >> >> Change-Id: I4bb37f9ebc6cfd711ad83f29cd95bc72c0d3bf45 >> --- >> gnu/packages/telegram.scm | 29 +++++++++++++++++++++++++++++ >> 1 file changed, 29 insertions(+) >> >> diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm >> index 358374a5bb..26ab27293f 100644 >> --- a/gnu/packages/telegram.scm >> +++ b/gnu/packages/telegram.scm >> @@ -400,6 +400,35 @@ (define cld3-for-telegram-desktop >> (base32 >> "0ayrrhfdwrf4260h9fsirkhhfrcvc3qqnh6h9wj3ixij2lq0wwqb")))) >> >> +(define cppgir-for-telegram-desktop >> + (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") >> + (revision "0")) >> + (package >> + (name "cppgir-for-telegram-desktop") >> + (version (git-version "2.0" revision commit)) >> + (source >> + (origin >> + (method git-fetch) >> + (uri >> + (git-reference >> + (url "https://gitlab.com/mnauw/cppgir") >> + (commit commit))) >> + (file-name (git-file-name name version)) >> + (sha256 >> + (base32 "1fa9nf4yljfarihaqj5kd98yysrky7q316mh6l5b1rq39ga15k9b")))) >> + (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 "GObject introspection C++ binding wrapper generator") >> + (description "cppgir processes .gir files derived from GObject >> +introspection annotations into a set of C++ files defining suitable >> +namespaces, classes and other types that together form a C++ binding.") >> + (license license:expat)))) > > That'd be reasonable as a new package if it was very tightly developed > with telegram, but it doesn't seem to be the case. I'd prefer having it > in (gnu packages glib). > > What is the "compilation error" you had mentioned when using version > 2.0? Does the cppgir release fails to compile itself, or is it > telegram that then doesn't build using that one? Sorry about not directly replying the previous message. It's the latter, telegram-desktop fails to compile with cppgir@2.0. > > If the later, I'd define, in (gnu packages glib) > > --8<---------------cut here---------------start------------->8--- > (define-public cppgir > [...] > "original package at version 2.0") > > (define-public cppgir-for-telegram-desktop > (package > (inherit cppgir) > (source ... (using latest or telegram-specific (?) commit)))) > --8<---------------cut here---------------end--------------->8--- For the lower package definition, I put it in (gnu packages glib) or (gnu packages telegram)? I think it should be the latter one? > > Sorry for the back and forth, we're narrowing down on the perfect > submission; keep it up. Don't forget to use -v5 for your next patches > submission :-), and ensure 'guix lint' is happy with all the packages. > > Thank you for your efforts! Keep it up. > Sorry about forgetting to add revision number to the patch series. Although we have mumi right now, there are still a bit of manual works to be done before sending patches. I constantly forget some of them. -- dan From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 09 07:55:53 2024 Received: (at 71897) by debbugs.gnu.org; 9 Jul 2024 11:55:53 +0000 Received: from localhost ([127.0.0.1]:52265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR9Rp-0005ak-5D for submit@debbugs.gnu.org; Tue, 09 Jul 2024 07:55:53 -0400 Received: from mail-qv1-f52.google.com ([209.85.219.52]:61465) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR9Rm-0005aH-ER for 71897@debbugs.gnu.org; Tue, 09 Jul 2024 07:55:51 -0400 Received: by mail-qv1-f52.google.com with SMTP id 6a1803df08f44-6b2c95b6c5aso26855986d6.2 for <71897@debbugs.gnu.org>; Tue, 09 Jul 2024 04:55:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720526078; x=1721130878; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:cc:references:in-reply-to :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=rGUq9F159fy5tuu0Qz2HoXB+DOKaeuCG0oOeP6HZKrg=; b=hyV/h4ykd9h1+Qb8YLZh+zeNHmASlqyyzMv2quBcC1GtJJBCjDwaayoBI6FxPJzfKX p8xnzWILUXuKcbfFTfo9arVe8ZuJBy1uB7PDYf2slGnGCZAh5M1IZZ3gJAgQI7MfEIGj bpsF+oGxvV6xC4eqoRl7ugycH0MNvDPZYnvNmDq1evvXmwgxAuKy3tuymBGjcgVJevz3 N2WAKOK2yZqlWx+FLTbIinkIM7N4fGNRn/PSAU4zlLYQxMxuEjvCjJwn1fdstartbYBM jZwfU0fAvWgv0EMpcNCcxuziAeYlkcHykcscFYFUZ2JB3u2SeaWFcsUgS5GnSjvn1qE1 Qp5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720526078; x=1721130878; h=mime-version:user-agent:message-id:date:cc:references:in-reply-to :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=rGUq9F159fy5tuu0Qz2HoXB+DOKaeuCG0oOeP6HZKrg=; b=rzHLlooiDqyaWEq7I770IgNkdhEmmDD32jXuONLlzAW1wIz5xv/yPSh5CZogxZlEcJ kCuooGNl6ca+Z+GvR9k0fSMW9Gf0BhDXG39Rsw+nOcmxVflP9K8sbUQlsSr4TJp7D7DC fWBOplmDeHXAiCqPBjLO47/BQLEMH36gtGHpHNA6cyw/YcxosqAOuhqtHAKxmC9Ll+K8 d1lRCAIB1VrdeJYq4CZgjDQtIge+OJ6pIzLSmnMWSkOH21uObWawHLFm14eR3W3cv8v1 oXHrx9/tLCoNuDWrqrtrj+kOGv9OGTPfLUlpSsr6u1j790ayZSF89lHUYIZdQhi6gCZH AJTA== X-Gm-Message-State: AOJu0YxuP+rNaMbnj3x+rCEAUu6E6cJz9j6R4K7EYYRALNXqgxsUwTqK 5+7+ZVnTGpqx0ztiPzJxgJqMCo0SmsWahgnXowjSKgO2uiJKgssY3JRxPg== X-Google-Smtp-Source: AGHT+IGgpAEKJBfwgsImWN4XQa39XSpeq9n+HuT7R7QoHM5C4s79ap8bPg4kWg02RNvum7YuIxvuBw== X-Received: by 2002:ad4:5ccc:0:b0:6a9:b253:58d5 with SMTP id 6a1803df08f44-6b61bca11a1mr28750056d6.17.1720526078015; Tue, 09 Jul 2024 04:54:38 -0700 (PDT) Received: from hurd (dsl-205-236-230-124.b2b2c.ca. [205.236.230.124]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b61ba73de5sm8081266d6.98.2024.07.09.04.54.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 04:54:37 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH 4/5] gnu: Add libprisma-for-telegram-desktop. In-Reply-To: (dan's message of "Tue, 9 Jul 2024 10:53:45 +0800") References: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> <80dd2fffb3b605252f0cbea2bf802e8345c15eec.1720364199.git.i@dan.games> <87cynnxppn.fsf@gmail.com> Date: Tue, 09 Jul 2024 07:54:36 -0400 Message-ID: <87msmqwzk3.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Dan, dan writes: > Hi Maxim, > > On 7/9/2024 10:29 AM, Maxim Cournoyer wrote: >> Hi, >> dan writes: >> >>> * gnu/packages/telegram.scm (libprisma-for-telegram-desktop): New variable. >>> >>> Change-Id: I855b463993654a8cad491c7b56c9581b3083f5e4 >>> --- >>> gnu/packages/telegram.scm | 12 ++++++++++++ >>> 1 file changed, 12 insertions(+) >>> >>> diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm >>> index 26ab27293f..0a48361eb4 100644 >>> --- a/gnu/packages/telegram.scm >>> +++ b/gnu/packages/telegram.scm >>> @@ -400,6 +400,18 @@ (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 "23b0d70f9709da9b38561d5706891a134d18df76"))) >>> + (file-name >>> + (git-file-name "libprisma-for-telegram-desktop" "5.2.3")) >>> + (sha256 >>> + (base32 >>> + "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) >>> + >> So this is built as part of telegram? If this doesn't have any >> proper >> build system to be built separately and linked, or if telegram lacks >> such a feature in its own build system (I like to report such feature >> request for that to upstream myself), another perhaps more maintainable >> strategy would be to use recursive? #t on the git-reference to clone >> these, and delete in a source snippet the submodules we don't want to >> have. > > Most of the dependencies of telegram-desktop are packaged this way, so > here I'm more or less following the convention. de If we decide to use > recursive? #t, I think it's better to fully revamp the packaging of > telegram-desktop. libprisma itself doesn't have a build system, and I > think it's only used in telegram-desktop. OK, fair enough. Thanks for the explanation (I also noticed the tens of git submodules as source variables in a later commit). Reviewed-by: Maxim Cournoyer -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 09 21:32:47 2024 Received: (at 71897) by debbugs.gnu.org; 10 Jul 2024 01:32:47 +0000 Received: from localhost ([127.0.0.1]:54533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRMCN-00055i-8d for submit@debbugs.gnu.org; Tue, 09 Jul 2024 21:32:47 -0400 Received: from mail-qt1-f174.google.com ([209.85.160.174]:58791) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRMCK-00055S-Sg for 71897@debbugs.gnu.org; Tue, 09 Jul 2024 21:32:45 -0400 Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-44acdd30c3fso2052151cf.1 for <71897@debbugs.gnu.org>; Tue, 09 Jul 2024 18:32:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720575093; x=1721179893; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=klpBw02jw1k3WnVOYDW7Xn1yclll4njkgXa+hvgFs8I=; b=KvgcFe21gT2R6JQTDk4RFwmdciwiKc8BXLPYlehfcbR9cz8uXZX2ZZkFnIapf56wVZ ZIUuwk1P6cmWYQWCm5RsvXlFp/c6y8m1fmo5zH5ZU6Vrs8HJ/4pOEhbBKcDeaM2fLJct kUPdY53Zz12V45BedLzm6IskOdUTZp81SY2p+alqTSez3AisF59Ye5AHmmn71kd0dTYZ MDhX9rIfQT70E7nzqrcJabtR7mlH6eK1JAO2gVtk41QLJIdFbHbQM7Gi3Ye69VDZTEY3 j4GAesTiZgMLvUbsnOUSbWvVrd0tSGn0UnDs45jc89W6BMzqi3PC+IcVMWfJaYRCKI5n AxNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720575093; x=1721179893; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=klpBw02jw1k3WnVOYDW7Xn1yclll4njkgXa+hvgFs8I=; b=SrDWfsUiEY+K2hH/99uJzZffcj1PLl3VEet805GZjjC/UhcJWRy2OUrsn2kn2KC+cq XJh7dGwiVQKG12ODXeToWdX3MLS/x1OOvrN2nCCrMvzfdOt/SDHl/ulrflx093KHTKk4 HI4X6CErDgXO0WP6lUlFNVfuBWAR+LQJasNTZzF6WBpnxJeSK1ObSJYrBOLx9hWVPZm7 hnaZb5SjN4Q3xUAEhHr9qQ5df8w/M4515clIH1rTc6+SIQxevT+qjOVTGz4TAuRBWRyM rXvmR00I+AuafK1eGjv6YTG9t6BJyIwZzpBG5fSkOF8U+pejHhNcLBrifMhhL4empGC/ csxQ== X-Gm-Message-State: AOJu0Yz9zdI+uekebkOUXlJ7ClH1NjgfI5c4+MwCBzfaECP9LVcxng7B JM00byPfRvD1d1kL5PACtVPIFMZ3KvOtdzdAx+zICsPwBKIzUolu X-Google-Smtp-Source: AGHT+IHnOIEfhwVO06B9xMlxsF0629ZxefK6+Pl8JWivJeQLq1yDFZuJ3iIWVTBtQpxHNOXtfI7LVA== X-Received: by 2002:a05:622a:52:b0:447:f1a9:64cd with SMTP id d75a77b69052e-447fa853603mr54622211cf.1.1720575093218; Tue, 09 Jul 2024 18:31:33 -0700 (PDT) Received: from hurd (dsl-205-236-230-124.b2b2c.ca. [205.236.230.124]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-447f9b26c83sm15855411cf.2.2024.07.09.18.31.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 18:31:32 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH 3/5] gnu: Add cppgir-for-telegram-desktop. In-Reply-To: <82e92de9-50ed-4f7b-91d7-253c41da5965@dan.games> (dan's message of "Tue, 9 Jul 2024 11:07:54 +0800") References: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> <17a452e63821067a5a3b27a6e4114404e242f290.1720364199.git.i@dan.games> <87h6czxpx7.fsf@gmail.com> <82e92de9-50ed-4f7b-91d7-253c41da5965@dan.games> Date: Tue, 09 Jul 2024 21:31:31 -0400 Message-ID: <87ed82vxqk.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Dan, dan writes: > On 7/9/2024 10:25 AM, Maxim Cournoyer wrote: >> Hi Dan, >> dan writes: >> >>> * gnu/packages/telegram.scm (cppgir-for-telegram-desktop): New variable. [...] >> That'd be reasonable as a new package if it was very tightly >> developed >> with telegram, but it doesn't seem to be the case. I'd prefer having it >> in (gnu packages glib). >> What is the "compilation error" you had mentioned when using version >> 2.0? Does the cppgir release fails to compile itself, or is it >> telegram that then doesn't build using that one? > > Sorry about not directly replying the previous message. It's the > latter, telegram-desktop fails to compile with cppgir@2.0. > >> If the later, I'd define, in (gnu packages glib) >> --8<---------------cut here---------------start------------->8--- >> (define-public cppgir >> [...] >> "original package at version 2.0") >> (define-public cppgir-for-telegram-desktop >> (package >> (inherit cppgir) >> (source ... (using latest or telegram-specific (?) commit)))) >> --8<---------------cut here---------------end--------------->8--- > > For the lower package definition, I put it in (gnu packages glib) or > (gnu packages telegram)? I think it should be the latter one? It's a bit counter-intuitive, but it has to be in the former, to avoid cyclic module dependencies caused by top level variables referring one another in different modules (that's fine for delayed fields, but the inherit field is not delayed). For more information on this topic, see (info 'guix (Cyclic Module Dependencies)'). >> Sorry for the back and forth, we're narrowing down on the perfect >> submission; keep it up. Don't forget to use -v5 for your next patches >> submission :-), and ensure 'guix lint' is happy with all the packages. >> Thank you for your efforts! Keep it up. >> > > Sorry about forgetting to add revision number to the patch > series. Although we have mumi right now, there are still a bit of > manual works to be done before sending patches. I constantly forget > some of them. I do like the ability of patman of recording where my submission metadata as git trailers in the top commit. Mumi could in theory avoid the need for automatically using -v though, since it can look at the past messages sent to an issue and could infer which revision should be used, in theory. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 14 11:50:16 2024 Received: (at 71897) by debbugs.gnu.org; 14 Jul 2024 15:50:16 +0000 Received: from localhost ([127.0.0.1]:58430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sT1UN-000213-Gi for submit@debbugs.gnu.org; Sun, 14 Jul 2024 11:50:16 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:39993) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sT1UK-00020o-PF for 71897@debbugs.gnu.org; Sun, 14 Jul 2024 11:50:14 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.nyi.internal (Postfix) with ESMTP id A311A114048D for <71897@debbugs.gnu.org>; Sun, 14 Jul 2024 11:50:05 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 14 Jul 2024 11:50:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm3; t=1720972205; x=1721058605; bh=rX9irR488r 5y35L0eiig31L70Ozwpw2kA+8uBuVclJM=; b=i4XjrC1njgoDO2L+ALJjYkx40g J0RIuaqAHf77ruc71z40ZbP+39V05O7l2umAPNCKlNi/QM7YhZorPAAYbtJOdsc9 A8bHp2t4YGHbu6NyVu+gTaIOxqp8WjRsLayRLhno3QQcJv9EQSLv738I5GZQ4jhU P2DKo7P25kB8EyBCFs/DU66j9z6DF5+yT7bQ/QPuDzcsqXfgKeZa6nav7K76fv1g 06pqqGpC36gi2MtkidoCyTb+Fx+KW1kv4BNNYGDTmR4luO0nDwRrMH9aPF3wNp5S HnMV0+JoC+WBmPIsJ+KgpiGbbeNbJTywR35f1mBFSyIq3idjxH4oN3bbOe5A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1720972205; x=1721058605; bh=rX9irR488r5y35L0eiig31L70Ozw pw2kA+8uBuVclJM=; b=sld49c+tcdaca+/aq2epaKXIHg46gRtS6VoOz2ElM65U 0fgQTP0HesURTBKXeNw41GX0qr1/Z/y4jv5VAIZ0zLgjJgq07HE58xs8P4uA6laO wdn9DnOH+Ll+yoTZE1mRjENAGJsFUYETYHX1lS9e4IFAZAKC6dQOO6QHmX2vRKVQ 4SxRqASvHIh9y4VOu6kCZY1vLIAME7ynuTmfwahw5NXl/MWT+m+nsKOOy5+QT/ue 2wswY2p/Rrn2lINU43TcmtYuZ0UKDHtJ4hP8ODxl83hbYCsf7oj8G/UpjkQLyETI HJ5lsAbuyuHqN69PQX0u0un2JTlxsM3/CnAdhwMn8Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrgedtgdelgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekredtre dtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgv rhhnpeegjeehgffggffgieehkedvkeevtefgjeetfedutdefvedttedutdefheehhfdthe enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegu rghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 14 Jul 2024 11:50:03 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v5 1/6] gnu: xdg-desktop-portal: Update to 1.18.4. Date: Sun, 14 Jul 2024 23:48:58 +0800 Message-ID: <86d68b5e47edc7d9be9cceff7941087131340ffa.1720972086.git.i@dan.games> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.18.4. [patches]: Disable portal tests. [native-inputs]: Remove autoconf, automake, libtool and which. Add python, python-dbusmock, python-pytest and python-pytest-xdist. [inputs]: Add bubblewrap. [phases]<#:configure-flags>: Update flags to meson options. Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 25 +++++---- ...-desktop-portal-disable-portal-tests.patch | 56 +++++++++++++++++++ 3 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index e584e426d0..7672c9fef0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2246,6 +2246,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-dbus-group-policy.patch \ %D%/packages/patches/x265-arm-flags.patch \ + %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xen-docs-use-predictable-ordering.patch \ %D%/packages/patches/xen-remove-config.gz-timestamp.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6941450436..2015ee46f8 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2022 Samuel Culpepper ;;; Copyright © 2024 aurtzy ;;; Copyright © 2024 Dariqq +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -133,6 +134,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages video) + #:use-module (gnu packages virtualization) #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -2989,7 +2991,7 @@ (define-public libportal (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.16.0") + (version "1.18.4") (source (origin (method url-fetch) @@ -2998,18 +3000,21 @@ (define-public xdg-desktop-portal version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav")))) - (build-system gnu-build-system) + "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q")) + ;; disable portal tests since they try to use fuse + (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("glib:bin" ,glib "bin") - ("which" ,which) - ("gettext" ,gettext-minimal))) + ("gettext" ,gettext-minimal) + ("python" ,python) + ("python-dbusmock" ,python-dbusmock) + ("python-pytest" ,python-pytest) + ("python-pytest-xdist" ,python-pytest-xdist))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) + `(("bubblewrap" ,bubblewrap) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("flatpak" ,flatpak) ("fontconfig" ,fontconfig) @@ -3021,7 +3026,7 @@ (define-public xdg-desktop-portal ("fuse" ,fuse))) (arguments `(#:configure-flags - (list "--with-systemd=no") + (list "-Dsystemd=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'po-chmod diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch new file mode 100644 index 0000000000..5e13493613 --- /dev/null +++ b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch @@ -0,0 +1,56 @@ +From b7750fa99c31c5f28ac2053fa154bef4038b5cc0 Mon Sep 17 00:00:00 2001 +From: dan +Date: Tue, 2 Jul 2024 19:37:38 +0800 +Subject: [PATCH] tests: remove portal tests. + +--- + tests/meson.build | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index a2dafee..bcd87be 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -181,18 +181,6 @@ portal_tests = [ + + test_env = env_tests + test_env.set('XDG_CURRENT_DESKTOP', 'test') +-foreach p : portal_tests +- test( +- 'test-portals-@0@'.format(p), +- test_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/portal/@0@'.format(p)], +- depends: [test_backends, test_portals], +- env: test_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + # Split the portal tests into one test per portal, this makes debugging a lot + # easier. +@@ -204,18 +192,6 @@ portal_limited = [ + + limited_env = env_tests + limited_env.set('XDG_CURRENT_DESKTOP', 'limited') +-foreach p : portal_limited +- test( +- 'limited-portals-@0@'.format(p), +- limited_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/limited/@0@'.format(p)], +- depends: [test_backends, limited_portals], +- env: limited_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + if enable_installed_tests + install_data( + +base-commit: 11c8a96b147aeae70e3f770313f93b367d53fedd +-- +2.41.0 + base-commit: 3b5533f9bdac4a929c3d93e628ee2ae279013685 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 14 11:50:18 2024 Received: (at 71897) by debbugs.gnu.org; 14 Jul 2024 15:50:18 +0000 Received: from localhost ([127.0.0.1]:58434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sT1UQ-00021J-5L for submit@debbugs.gnu.org; Sun, 14 Jul 2024 11:50:18 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:51155) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sT1UO-00020t-Lp for 71897@debbugs.gnu.org; Sun, 14 Jul 2024 11:50:16 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 0FB7411405A6 for <71897@debbugs.gnu.org>; Sun, 14 Jul 2024 11:50:10 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 14 Jul 2024 11:50:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1720972210; x= 1721058610; bh=s0ElIGEZ/w5qUaY76MOIgbVu4ZRSfsnFVzsMbM7EZ3E=; b=g qFSwnrOS/BZHSoDlHk0iMxSYlKVk5b0oyjtCalgtA4darlSumwVaPWZBFdO5+4Tt R9zvfZE9TPKpT1+ZfOqf/zWTAFM7gxBgF9dEer1Um+2lU/KXobAIaExbyO2L31C/ 49ecHe9VMz/+9l9DxGLfNmM+AEtRP4x+hzOpviFsxvzvszXXV3lq2XhzaNEFjQDU jeJ/K+6kvcB/g/yDC7oG0/SWdzXAXjFpKA+2HzTjuqiL8LCCDnUiY6LbKnbHjpd/ TJ9mD6ZAdgSXju+9/3sQ9GgW7VzVMZ1Qr8hEYNKsG+D4bo1u2ySxKlxPr+8e0nef U7g6XiwjwIDNgvfa878bQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1720972210; x=1721058610; bh=s0ElIGEZ/w5qU aY76MOIgbVu4ZRSfsnFVzsMbM7EZ3E=; b=sfFdRM+adGgCpK/Rg/pv+XhiV4TEW MD5dMQeMMjiHPvyb8naUhCV7uBFnfGyYGB2TCvGJF/UaSEONzjsKDLs25Gr0Wu1d XqDsduU65j29Gd/OS7WtZzqkZHd0ABFbR5Yv8Rb0dGEeVOUQCoS2vZa4qvkIVVJy quawfGvOktLfp5uccWpTvlfA/TEJBSIC4YoQ73f2dyMoH0cMXXbGsIUqzGauyRrq f9ba9z5frXLjU2BFG0MmqZ8nctejaDPbdJDGUKGI5wsaqlqu8w04KYL5RWAmsRse Y57PV9LXyfeVhXCizz6f7X+yLuDO0JyqbzCugkP5+QvVO5b1X1qZ48bwA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrgedtgdelgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepfeffffdtheettedvleeiheegheetvdetteehgfetiedvteeggedtjedtuddule dunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihes uggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 14 Jul 2024 11:50:07 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v5 2/6] gnu: xdg-desktop-portal: Update input style. Date: Sun, 14 Jul 2024 23:48:59 +0800 Message-ID: <9fe7154be13e30720b6a3f25e6361e971279fffd.1720972086.git.i@dan.games> X-Mailer: git-send-email 2.45.2 In-Reply-To: <86d68b5e47edc7d9be9cceff7941087131340ffa.1720972086.git.i@dan.games> References: <86d68b5e47edc7d9be9cceff7941087131340ffa.1720972086.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update input style. Change-Id: Iec0630cd945dfcd4db67af30211cbfd4d058766d --- gnu/packages/freedesktop.scm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 2015ee46f8..28954451d5 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3005,25 +3005,25 @@ (define-public xdg-desktop-portal (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) (build-system meson-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("glib:bin" ,glib "bin") - ("gettext" ,gettext-minimal) - ("python" ,python) - ("python-dbusmock" ,python-dbusmock) - ("python-pytest" ,python-pytest) - ("python-pytest-xdist" ,python-pytest-xdist))) + (list gettext-minimal + (list glib "bin") + pkg-config + python + python-dbusmock + python-pytest + python-pytest-xdist)) (inputs - `(("bubblewrap" ,bubblewrap) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) - ("flatpak" ,flatpak) - ("fontconfig" ,fontconfig) - ("json-glib" ,json-glib) - ("libportal" ,libportal) - ("dbus" ,dbus) - ("geoclue" ,geoclue) - ("pipewire" ,pipewire) - ("fuse" ,fuse))) + (list bubblewrap + dbus + flatpak + fontconfig + fuse + gdk-pixbuf + geoclue + glib + json-glib + libportal + pipewire)) (arguments `(#:configure-flags (list "-Dsystemd=disabled") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 14 11:50:23 2024 Received: (at 71897) by debbugs.gnu.org; 14 Jul 2024 15:50:24 +0000 Received: from localhost ([127.0.0.1]:58438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sT1UV-00021b-Fr for submit@debbugs.gnu.org; Sun, 14 Jul 2024 11:50:23 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:35899) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sT1UT-000215-0d for 71897@debbugs.gnu.org; Sun, 14 Jul 2024 11:50:22 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 627461140482 for <71897@debbugs.gnu.org>; Sun, 14 Jul 2024 11:50:14 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Sun, 14 Jul 2024 11:50:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1720972214; x=1721058614; bh=A0tcpwjdwvTe0AC8pV/Q+t+FXDxdKrr8QRbVovQZxY8=; b= NQNpK/wJIB3A630BKz1Gn4SRKAuk7f49+rJ+h6OMvZ3l3seVrh9CWk6TXxNaLhZV 0AXLdEgiqQyBAubqfSeDPBIHcZ2mT2GOn0488KXSDeQeIpo+QM17BpYPI3ZNHi3d 32XG1VTDkDGqXWHJVLp+9ycimSgaf3ByTlR7lfRuyR0II5aiVwoYnNlmfeKRUWDA 3Av5ZozsFYEkVq6O5X6jwOdv3KvnG9H4aTwilR/xFmqVjoN5mtK7o470+KIbVl4e +ABL3V5CFoIwsEx4HwK8ssh0njuAzE8d3VzRQDjjJ0OYK1hvl2/QfPlxMky60buU 5Q9LfdShKrUUHwyc7wz77Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1720972214; x= 1721058614; bh=A0tcpwjdwvTe0AC8pV/Q+t+FXDxdKrr8QRbVovQZxY8=; b=a GZNAgVhit6IVmdiyeKnHkSwkDZ+xH4LCCkHrlOVC1tqhg2zjhsFXdbL9nIC0fQGc 0TjTNM7nrtsxxEqrYAp+h2EDB92/oA7MbILH+18HcaL8g1dWNQUD1HSY13I4qKjU 4AzEj/WV4kcyGaYEVWvRSFSBohpQy+MzVSxLkOIyabRCdV8OQqFRlZ8od1MaEArJ ecfaY3wIQizFS+JrgtD0Ka9yTFd3/kM94UDCjDWRChU8KlF+FCVgJQBDTxJAFgUq O5oHF/zV1YUP2Z4DNFOeGw5Ptu25HttGNuOOkuK64pNdeZs0rT58smBSsITpapOE hajGQ9YJAeX4fGtfjeOyA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrgedtgdelgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesthekre dtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrght thgvrhhnpefgtedttdfgtddtieffudeffeelgedtuddtvdevheektdeifedvieefieffie ejueenucffohhmrghinhepghhithhlrggsrdgtohhmnecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 14 Jul 2024 11:50:12 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v5 3/6] gnu: Add cppgir. Date: Sun, 14 Jul 2024 23:49:00 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <86d68b5e47edc7d9be9cceff7941087131340ffa.1720972086.git.i@dan.games> References: <86d68b5e47edc7d9be9cceff7941087131340ffa.1720972086.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/glib.scm (cppgir): New variable. Change-Id: Ic4510be6d05b7b3977aa457c6a7fec382c1d3a88 --- gnu/packages/glib.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b11046f05d..3a44207afe 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Saku Laesvuori ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,6 +72,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) @@ -1594,3 +1596,30 @@ (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 "2.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cj4myqzb28hgb7zlxlba9y8n4ysxkvv2y9wy6f7ps58mr18h7bl")))) + (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 "GObject introspection C++ binding wrapper generator") + (description "cppgir processes .gir files derived from GObject +introspection annotations into a set of C++ files defining suitable +namespaces, classes and other types that together form a C++ binding.") + (license license:expat))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 14 11:50:27 2024 Received: (at 71897) by debbugs.gnu.org; 14 Jul 2024 15:50:27 +0000 Received: from localhost ([127.0.0.1]:58442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sT1UY-00021s-VT for submit@debbugs.gnu.org; Sun, 14 Jul 2024 11:50:27 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]:52421) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sT1UX-00021S-6D for 71897@debbugs.gnu.org; Sun, 14 Jul 2024 11:50:25 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.nyi.internal (Postfix) with ESMTP id 7F79B13813C8 for <71897@debbugs.gnu.org>; Sun, 14 Jul 2024 11:50:18 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Sun, 14 Jul 2024 11:50:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1720972218; x= 1721058618; bh=QphVA2QQiWZbYnBq6lhAgKH6ivQYdGWmg1iKe8I3cJg=; b=O SexAGBYtQ6T6Eua2Q1yr5JhO7KDDxUTfGsRJdHw9A1hlu4v5SBQWqDaJBqVuhQBF rFdBI8yIud6ata+E2Rd615iBrZu8O9wPbo06MlU5GNc/pnruOxjSkMfQv0QG6uA7 uBeBbfWPSJEcNUqXr1yee7Hg7lDYdPLIbtG79QAv6bLU0K9xc6L5LMPU2w91RxDo O1te7scG1557Pjw4ijTRIt7VhEMfRhHm+FeU4sFIdqyTBUCyXPtrB7HOltA/P2eJ hEPI5i9GtbMWkiskc5kcMDdkdge0AJCtEhgILh39H/a4or/wQTDZz60iGA+3y/fC EVbQwDjuCpBcbUkK1SAxA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1720972218; x=1721058618; bh=QphVA2QQiWZbY nBq6lhAgKH6ivQYdGWmg1iKe8I3cJg=; b=G7bAQmCQ5v970wf1TumVR7xDafRg5 ZJEwV2SuivwkFjc3XK61V+H9lSm+3bz1qZArjWIZqNJj474ZBBJ5JKf0qCOUbK71 Z8Dvwc9SlSLVWFlGsCq48E33/1hqDLgOQThOPHIJ/F2CdktryAR46+lceRQ0VOJX 2+foPZjzQLsEXOw/I3yPHNPGcG2MpMpyWxE4ivg3m5aNv8g0h9+S2AAcQ5Vh5Akf 8NOCYXL6AfTI716o7TKOiZ1UVA+cpTqd61qeQA3zNuy6zr0cFsHSVaqxYT8mYNsy pAXBkJYzV8WDCh/896O6sO2nYkMCkKD135mTztDYHf9scgmxRll0RiE8g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrgedtgdelfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepleelgffffeeigfelteduleeigfejvdetuefggfehgffgieevhfdvveeffedtle ejnecuffhomhgrihhnpehgihhtlhgrsgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 14 Jul 2024 11:50:16 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v5 4/6] gnu: Add cppgir-for-telegram-desktop. Date: Sun, 14 Jul 2024 23:49:01 +0800 Message-ID: <7b5f9de226a097c8bd929d88250961aabf156431.1720972086.git.i@dan.games> X-Mailer: git-send-email 2.45.2 In-Reply-To: <86d68b5e47edc7d9be9cceff7941087131340ffa.1720972086.git.i@dan.games> References: <86d68b5e47edc7d9be9cceff7941087131340ffa.1720972086.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/glib.scm (cppgir-for-telegram-desktop): New variable. Change-Id: Ib9ca3bd376f32d13939adabd2c52e1eb24e2ddcb --- gnu/packages/glib.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 3a44207afe..29ac8d5542 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1623,3 +1623,22 @@ (define-public cppgir introspection annotations into a set of C++ files defining suitable namespaces, classes and other types that together form a C++ binding.") (license license:expat))) + +;; telegram-desktop requires a more recent version of cppgir +(define-public cppgir-for-telegram-desktop + (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") + (revision "0")) + (package + (inherit cppgir) + (name "cppgir-for-telegram-desktop") + (version (git-version "2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fa9nf4yljfarihaqj5kd98yysrky7q316mh6l5b1rq39ga15k9b"))))))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 14 11:50:30 2024 Received: (at 71897) by debbugs.gnu.org; 14 Jul 2024 15:50:30 +0000 Received: from localhost ([127.0.0.1]:58446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sT1Uc-000228-HF for submit@debbugs.gnu.org; Sun, 14 Jul 2024 11:50:30 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]:44981) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sT1Ub-00021i-8M for 71897@debbugs.gnu.org; Sun, 14 Jul 2024 11:50:29 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailfout.nyi.internal (Postfix) with ESMTP id 9EBE4138126F for <71897@debbugs.gnu.org>; Sun, 14 Jul 2024 11:50:22 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sun, 14 Jul 2024 11:50:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1720972222; x= 1721058622; bh=eesGP8DiKugLInoqxOL8lfOtd2LZGSw4TlUYAsxgVKU=; b=g ZCv66vCCuwRd6FLaKOMzUoC43AVadgHrqL3FbOj7h1NppihTpprxiXEMQ6PoAEnr Bor2yOWo7CJx1iyqbWJtfa59aX9Nf9YdtlSdRJSG6DZRE2oYNH37Ke5Gj2RiuZya gUIzmF31+cY8bZrgtiK61oCsBXmp82oJxe0DQjq5JUHIjrsTGUBamZV0L13YXJJD d2HUIR++0wwU6xSVVVI2LhF+jbteEjY/Yh3AvCcl4pydRfWG0jlVTFbYW5ulHLjP SiiR6DgyNMzWmExafnM58n2AzCjo2nmJXXdBKzjXqFOuei6kW33uViLCG9DcPXXW fgd6MyfCCICl0CxHh69Qw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1720972222; x=1721058622; bh=eesGP8DiKugLI noqxOL8lfOtd2LZGSw4TlUYAsxgVKU=; b=vwU0q6INd+4bqrcrMnjBA2f2cZP0T RtpvbamXFqL34hcoLabDZ9M+2IudrG5zPBlcjDV3Db6LTcwZ4VBmCXaNPhBBC1rM YTmYg13vRmXS70Lz9JpkB/rLjqstT8r35xQ4xFqG+3d4Fywvr3RMXNi15Eq0Zlo2 tHiHpW/YPFJvAqcyWmGxpqqrQdIaAJ4HbWFDJTiQtgSjqdoLR9e3WpsEY190bQij +ndsja974323mCoE6VCrgjNEigbWGBOIaYp8+dsC7Oo8oDTElXx6fj1VNBMYMj4V vqaZArdmzanMUqe/YeaGgMwjoJEwUykeg9pBVUKl7QIh56hf619rL+j3g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrgedtgdelgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 14 Jul 2024 11:50:20 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v5 5/6] gnu: Add libprisma-for-telegram-desktop. Date: Sun, 14 Jul 2024 23:49:02 +0800 Message-ID: <5d67e151ba061c7473f971d2cf9de1be52e56317.1720972086.git.i@dan.games> X-Mailer: git-send-email 2.45.2 In-Reply-To: <86d68b5e47edc7d9be9cceff7941087131340ffa.1720972086.git.i@dan.games> References: <86d68b5e47edc7d9be9cceff7941087131340ffa.1720972086.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/telegram.scm (libprisma-for-telegram-desktop): New variable. Change-Id: I855b463993654a8cad491c7b56c9581b3083f5e4 --- gnu/packages/telegram.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 358374a5bb..d7e69aa113 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -400,6 +400,18 @@ (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 "23b0d70f9709da9b38561d5706891a134d18df76"))) + (file-name + (git-file-name "libprisma-for-telegram-desktop" "5.2.3")) + (sha256 + (base32 + "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) + (define-public telegram-desktop (package (name "telegram-desktop") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 14 11:50:38 2024 Received: (at 71897) by debbugs.gnu.org; 14 Jul 2024 15:50:38 +0000 Received: from localhost ([127.0.0.1]:58450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sT1Ui-00022Q-Sx for submit@debbugs.gnu.org; Sun, 14 Jul 2024 11:50:37 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:41233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sT1Uf-000220-I2 for 71897@debbugs.gnu.org; Sun, 14 Jul 2024 11:50:35 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfhigh.nyi.internal (Postfix) with ESMTP id E778511405A6 for <71897@debbugs.gnu.org>; Sun, 14 Jul 2024 11:50:26 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Sun, 14 Jul 2024 11:50:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1720972226; x=1721058626; bh=ThnO0sWLaHRM0rq/Ld2psosgr64npwepCWb0h0uuN3Q=; b= E3d/ohPYqdPIVnSf7qTCa2U+qmr7XcYfZu0Pf40XuiXu92YH/NMjQ6+ZVpiLOk3i U1MOL465AFpi5sZxyjA+VjyUFe5rmj4gvmKg96OEjO5irKcPMfER9xX7M7CRWaOw r32Vfb6hWuSeDUd2bJv8PrnsWME5kUFT3hzcRh5HnbwMRUxkYTBYxcMxlRkOBLUV nHnZYfc5lR8LNSbSTI7ywbbKnjemSIj0wecKBkS08mlqQ9Ryb+JfXO+WzapyP+nZ ZQM0Rez4CUIbeOP1g9DtUwYHE6F4bk4xobUUqHiEY8ieYlc8/g7blLyFNYjuCSdP f6GhH6cLq+nvA6uxCNe3Ig== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1720972226; x= 1721058626; bh=ThnO0sWLaHRM0rq/Ld2psosgr64npwepCWb0h0uuN3Q=; b=T WX4fOn9RBrfB7/+m4k/IzJf/XYmzRkK1MjQiRMR10vAsKX/m1v7uc3r/vNLAlsHK 4uLpWQJ9CHBoemMT/ijAm62sLAWrnaWqhcysqVD1Ngzx4paemcXgNm+Nn1wLVaWN /EuVEpugHyPn0VCF2paj5sFAL4SpkRiT4mujrI2I+6Tb0AnnbRBpmEcfSq4vfsbe JfEbQxGSHSWwJ2yT3RR/cLo2SYS1+I4dMVg/sfDB0652m8eqIfRN1RoXxTbZlWC3 5NRlktllqi1TDrYFpn5W3XSIL8Iyyx26rwLMRTP7VULc8uAJisOAjZiF/Dz93GEW FdW5AEpRrcZSA1OrgWvzA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrgedtgdelgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecufghrlhcuvffnffculdduvddmnecujfgurhephffvuf ffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhg rghmvghsqeenucggtffrrghtthgvrhhnpeeikeeuvddtveelgeehudehleehteffhffhff fhvdevgeevkeehhfffieeuieegieenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhk ihhtfigrrhgvrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 14 Jul 2024 11:50:24 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v5 6/6] gnu: telegram-desktop: Update to 5.2.3. Date: Sun, 14 Jul 2024 23:49:03 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <86d68b5e47edc7d9be9cceff7941087131340ffa.1720972086.git.i@dan.games> References: <86d68b5e47edc7d9be9cceff7941087131340ffa.1720972086.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. * gnu/local.mk (dist_patch_DATA): register them. * gnu/packages/telegram.scm: (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)[origin]: Add patches to unbundle gsl and cppgir. (libprisma-for-telegram-desktop): Use %telegram-version. (telegram-desktop): Update to 5.2.3. [#:phases]: Add libprisma-for-telegram-desktop. : New phase. : New phase. [native-inputs]: Add gobject-introspection and xdg-desktop-portal. [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite. Change-Id: I78df3434a2cd04afc54107b7fecd5e5a8df85564 --- gnu/local.mk | 2 + .../telegram-desktop-unbundle-cppgir.patch | 95 +++++++++++++++++++ .../telegram-desktop-unbundle-gsl.patch | 31 ++++++ gnu/packages/telegram.scm | 89 ++++++++++------- 4 files changed, 185 insertions(+), 32 deletions(-) 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 7672c9fef0..af0b583ee2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2141,6 +2141,8 @@ 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-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-unbundle-cppgir.patch b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch new file mode 100644 index 0000000000..a24dbe25bb --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch @@ -0,0 +1,95 @@ +From a5c42e07ae223d440ff11347e0cf1fd58fd383df Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 1/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/CMakeLists.txt | 4 +++- + external/glib/generate_cppgir.cmake | 7 ++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt +index 3c6fe4be..c862705f 100644 +--- a/external/glib/CMakeLists.txt ++++ b/external/glib/CMakeLists.txt +@@ -13,9 +13,11 @@ function(add_cppgir) # isolate scope + set(BUILD_EXAMPLES OFF) + add_subdirectory(cppgir EXCLUDE_FROM_ALL) + endfunction() +-add_cppgir() + + include(generate_cppgir.cmake) ++if (NOT CppGir_FOUND) ++ add_cppgir() ++endif() + generate_cppgir(external_glib Gio-2.0) + + find_package(PkgConfig REQUIRED) +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index c15d3f9e..9b0a5ac8 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 2.0) ++ + function(generate_cppgir target_name gir) + set(cppgir_loc ${cmake_helpers_loc}/external/glib/cppgir) + +@@ -17,6 +19,9 @@ function(generate_cppgir target_name gir) + ${cppgir_loc}/data/cppgir.ignore + ${cppgir_loc}/data/cppgir_unix.ignore + ) ++ if (CppGir_FOUND) ++ set(ignore_files) # rely on default ignore list ++ endif() + + set(gir_path) + if (IS_ABSOLUTE "${gir}") +@@ -33,7 +38,7 @@ function(generate_cppgir target_name gir) + --class + --class-full + --expected +- --ignore ++ "$<$:--ignore>" + "$" + --output + ${gen_dst} + +From eed39522952c15f448c54290454806dd011c4996 Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 2/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/generate_cppgir.cmake | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index 9b0a5ac8..2ad82277 100644 +--- a/external/glib/generate_cppgir.cmake ++++ b/external/glib/generate_cppgir.cmake +@@ -15,11 +15,12 @@ function(generate_cppgir target_name gir) + + set(gen_timestamp ${gen_dst}/${target_name}_cppgir.timestamp) + +- set(ignore_files +- ${cppgir_loc}/data/cppgir.ignore +- ${cppgir_loc}/data/cppgir_unix.ignore +- ) +- if (CppGir_FOUND) ++ if (NOT CppGir_FOUND) ++ set(ignore_files ++ ${cppgir_loc}/data/cppgir.ignore ++ ${cppgir_loc}/data/cppgir_unix.ignore ++ ) ++ else() + set(ignore_files) # rely on default ignore list + endif() + 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..f89d326a5c --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch @@ -0,0 +1,31 @@ +From a3ac6df0441b4caca28b1df87febc420e18942ce Mon Sep 17 00:00:00 2001 +From: Zephyr Lykos +Date: Mon, 23 Oct 2023 15:55:24 +0800 +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 8eaf19c5..344f9488 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) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index d7e69aa113..530fd4c66c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2023 Lu Hui ;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; Copyright © 2024 Ricardo Wurmus +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,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) @@ -82,11 +84,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 "5.2.3") (define libyuv-for-telegram-desktop - (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") - (revision "2439")) + (let ((commit "04821d1e7d60845525e8db55c7bcd41ef5be9406") + (revision "2440")) (origin (method git-fetch) (uri (git-reference @@ -97,67 +99,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 "4a4bc4cd34b3ade038541a2b8b2c79f05393d67b"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) + (patches + ;; https://github.com/desktop-app/cmake_helpers/pull/320 + ;; https://github.com/desktop-app/cmake_helpers/pull/305 + (search-patches "telegram-desktop-unbundle-gsl.patch" + "telegram-desktop-unbundle-cppgir.patch")) (sha256 (base32 - "0y96mvzs113zh8bdw1h3i6l0pgwg93rigrday8kfdg4magz686k6")))) + "129m2wy3jyrcngsln46k7cl00jjg30kj9kdfil7aq9c23z3iqvm8")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "1a969faa0afb29d53af03e530775eccdfb8433f1"))) + (commit "0af136124083369073b8fdaf45f0816fd2b10bad"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1xmw8dfm51p5g20rlmzqnr72a14ngyxwq09an8clf1v5s6mmwvak")))) + "057bwn9smrgnyfb1vraf50ihbkhjc4d72msl7vnbqc4h5sg8dav9")))) (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 "1a50fd2300da3198e751a22bf728d33822180e15"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83")))) + "1hyhqz6mwdmcs6wcglz3hwlzl1n04lfi22d3n75ad40qfc9kh3ci")))) (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 @@ -188,24 +195,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 "0b7622ff38778e9cd03d3997de59351973480a1f"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "147xbbcza5q4wcdipk5jplajzkc48971kg2s7qv5jlz33sxkw1lq")))) + "0s9fjxpxxvj1xgzg3sfw6079blgmdvbb5cy6wb921sqaqwf52j6x")))) (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 "0971b69ca90f1697ef81276d9820dcd6d26de4ac"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) + "0ihbh1ajns0sf42h9992hnawwjr1n439sgb0g4zirn2bj5i1zbdv")))) (define lib-tl-for-telegram-desktop (origin @@ -224,52 +231,52 @@ (define lib-ui-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "37531086ec21a8569deddedb11b402f8a3157b90"))) + (commit "96be2a6b72f0405a9c01407148303fba2dab101c"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0")))) + "0y989q2xs5hjm7dg7rpgyqlalf8sjklhg0v26nnzfgabl8248bgy")))) (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "b68a95ad4d1ae9a1827671100a7fd76cbe448c3f"))) + (commit "eb9496540356945e2c9fb700bcfa51444fd36f41"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1c8jwdnn26n13yp0rp0l71q6xlxa6wp3cspbm3pnghw964jwgp3z")))) + "0nqlzb02b39ywjmazx30y43nalvc3ypkqjh5zvs35gnvm9x2hy43")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "f632fc84cbc62ae8abbbd05f81d472757a337c11"))) + (commit "363db4e49a0b78e5dd08bd922e09cf8810318c09"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i")))) + "1l84rlm4cb56q87k5036n4c0g49f6a5qlhrjc5wn57s56wphvhqn")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "2e2797648aac2588e7fe479c2e8b4455ec65c5e6"))) + (commit "b9fa8b84d8abe741183f157218ac038c596a54a5"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) + "1swni7xw5l0q376b6rnf9h93arzjqm9rkv7g6hz67742lf9a0x9z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") - (revision "389")) + (let ((commit "c9cc4390ab951f2cbc103ff783a11f398b27660b") + (revision "399")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -285,7 +292,7 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) + (base32 "0x2hjliiapb9kacbg8fwkz7g09c9k8dc77xxycjh5kmm1fc2i6dd")) (patches (search-patches ;; https://github.com/desktop-app/tg_owt/pull/123 @@ -407,7 +414,7 @@ (define libprisma-for-telegram-desktop (url "https://github.com/desktop-app/libprisma") (commit "23b0d70f9709da9b38561d5706891a134d18df76"))) (file-name - (git-file-name "libprisma-for-telegram-desktop" "5.2.3")) + (git-file-name "libprisma-for-telegram-desktop" %telegram-version)) (sha256 (base32 "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) @@ -427,7 +434,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) + (base32 "1jwm8irjx5yfzd9a94f5dy4y9v5as0an8m83hlal6czlqbi5v4sm")) (patches (search-patches ;; https://github.com/telegramdesktop/tdesktop/pull/24126 @@ -493,21 +500,39 @@ (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 'unpack-additional-sources 'use-system-xdg-desktop-portal + (lambda _ + (substitute* (list "Telegram/CMakeLists.txt" + "Telegram/lib_base/CMakeLists.txt") + (("\\$\\{third_party_loc\\}/xdg-desktop-portal/data") + (string-append #$(this-package-native-input "xdg-desktop-portal") + "/share/dbus-1/interfaces"))))) (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 (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs (list `(,glib "bin") + gobject-introspection `(,gtk+ "bin") pkg-config - python-wrapper)) + python-wrapper + xdg-desktop-portal)) (inputs (list abseil-cpp-cxxstd17 alsa-lib + boost c++-gsl + cppgir-for-telegram-desktop crc32c + expected-lite fcitx-qt5 fcitx5-qt ffmpeg -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 27 11:57:50 2024 Received: (at 71897) by debbugs.gnu.org; 27 Jul 2024 15:57:50 +0000 Received: from localhost ([127.0.0.1]:42152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXjnq-0003zZ-0p for submit@debbugs.gnu.org; Sat, 27 Jul 2024 11:57:50 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:58375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXjnn-0003yX-6g for 71897@debbugs.gnu.org; Sat, 27 Jul 2024 11:57:48 -0400 Received: by mail-ej1-f65.google.com with SMTP id a640c23a62f3a-a7aa4bf4d1eso320768466b.0 for <71897@debbugs.gnu.org>; Sat, 27 Jul 2024 08:57:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722095791; x=1722700591; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=l/pC8m2WeRAwgivhHOgIdpXO2wIKRQJCJkxpEWCUZ4o=; b=MAWIF5t8+6Tb97UQkrEvwbmgrTwHJcjV7o373xG0tLtWQeIicdeBb1vId7vvtOIxDq sHvTwVYxA9GcZzW1OUS+9wRFLO1Bj4nBh7TFEEZ/+8eG6l32qJcB9J4gYRDhFfnFt3B3 0WcSWxwPqUmTAAwTmZSpxBHz2MfWdkWx15dkLd2+T9T1LqCAJxcR1N6vnkOMQl1oVctv UxyrORsCLDOSjsrBcNpLT0DuFe7LLM2oxxWV50VRog1xm28kMPOWvzG7Y/Q0+ulyMWM1 Wi3KuhDA9LDeC/yCyxFEzCX+omrfaY5NEKT47LiwJZOtY7WmTHXiFMkNEJhdTfdjW+zn 2jHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722095791; x=1722700591; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=l/pC8m2WeRAwgivhHOgIdpXO2wIKRQJCJkxpEWCUZ4o=; b=vEWCSR+tvgxpHZy3O4S68/7dO9bMnE7GEeBx1k121aJ0QXT1tTm1JxKmyt7Phzkmqa 6l25YCwATV5Vy5vh85Ijvmg9P3lKHfylzsXzPK94Fj/6WrknROIEPItpIOzLjMkZC8md FL+5H9HpF3cZIqVaRkLAeLMNY5L/k9z2mYSC/9TCWhL/zOjCMNuRE1zRrBP45Cc5k3G7 QmMgBqIvjiMlH3lhUTRmgCYPf7F6cHAV4rUb0IStoDxkswxJOb/LCc9bKUWxJ7Iz4fKe kM1c5Cz1h3V8NqiXBVs/saexvHNcJWI520j824At/TFyxc1mCz7PagRlipU4vexsvaNS MFeA== X-Forwarded-Encrypted: i=1; AJvYcCU1GoQ+phLNjYzFO9DKkzD4r0/XecpXNwuo+s85Cdp7hJw5Qwq7blyVwimIsMeaV1cenleWDmesyA/9EBB6GX4PoldcTV8= X-Gm-Message-State: AOJu0YwK1kJi7vY87Ydqyveokl4iQgqmbiPV/nK6GIxoa5mCibzLVgxe g9AqZRyUAeJg2JxwymysG6KJebAycTroKVGED3vIwsJu9QZqeTPK X-Google-Smtp-Source: AGHT+IHIyo2301uMdSohlpOcNRrLA/YaxtBA6JYkUhHzYoF5xsg+CE58+hSCw2MxjPFPLjqTRonFog== X-Received: by 2002:a17:907:7244:b0:a7a:a138:dbc5 with SMTP id a640c23a62f3a-a7d4013d635mr209552166b.65.1722095790727; Sat, 27 Jul 2024 08:56:30 -0700 (PDT) Received: from lumine.fritz.box (85-127-20-124.dsl.dynamic.surfer.at. [85.127.20.124]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acab231fdsm290863866b.41.2024.07.27.08.56.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jul 2024 08:56:30 -0700 (PDT) Message-ID: <15e484c8c6a14da7f1c487e3eea7f86a22574649.camel@gmail.com> Subject: Re: [bug#71897] [PATCH v5 6/6] gnu: telegram-desktop: Update to 5.2.3. From: Liliana Marie Prikler To: dan , 71897@debbugs.gnu.org Date: Sat, 27 Jul 2024 17:56:19 +0200 In-Reply-To: References: <86d68b5e47edc7d9be9cceff7941087131340ffa.1720972086.git.i@dan.games> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Am Sonntag, dem 14.07.2024 um 23:49 +0800 schrieb dan: > * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New > file. > * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New fi [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.65 listed in list.dnswl.org] 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.218.65 listed in bl.score.senderscore.com] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.65 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 71897 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Am Sonntag, dem 14.07.2024 um 23:49 +0800 schrieb dan: > * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New > file. > * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. > * gnu/local.mk (dist_patch_DATA): register them. > * gnu/packages/telegram.scm: > (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. This is minor, but the ChangeLog format uses closing parentheses before continuation lines. > (cmake-helpers-for-telegram-desktop)[origin]: Add patches to unbundle > gsl and > cppgir. > (libprisma-for-telegram-desktop): Use %telegram-version. > (telegram-desktop): Update to 5.2.3. > [#:phases]: Add libprisma-for-telegram- > desktop. > : New phase. > : New phase. > [native-inputs]: Add gobject-introspection and xdg-desktop-portal. > [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite. >=20 > Change-Id: I78df3434a2cd04afc54107b7fecd5e5a8df85564 Can anyone confirm, that this patch builds? CI didn't build it and ld died to OOM on my machine. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 04 10:31:49 2024 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:31:49 +0000 Received: from localhost ([127.0.0.1]:56864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacGy-00013P-KO for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:49 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:34093) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacGr-00012f-93 for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:45 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfhigh.nyi.internal (Postfix) with ESMTP id A5FD21147516 for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:14 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 04 Aug 2024 10:31:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm1; t=1722781874; x=1722868274; bh=W3HS4s7rR3W6A5DAiubnK OggOAYXcbHcSPp0C3WglE0=; b=Qz7TLIgCdEXeZllMnkD9ftswrf+R2vxrHg7T7 KAoTs2/9y0Y3MU9XelfRHa/2fdUa2gb/mcFGcya9mTEYjTEvTauZbzbizzOMw+E3 Zjw6PaOgzVgS3Roe6dCxXVePTcNymf4lf1nYk1KTey3d1K4NrK03YYNYrVLuBsER 3VE0zR8NzlGF3usW8yUbVSzFOtrosdAu4/1msIgWzpQgIXUFGEwsuzM07l+jzVsy zAHCDZUadyPPheASYBPPwgVkSw3A+9a4RNgxzLiZBxipzsMstVRke1LMpVN3ER+v UpT+wtD5kl3oDHKspweEfPaE9piHGUzyEuMIFc8D+qau4Ysyg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1722781874; x=1722868274; bh=W3HS4s7rR3W6A5DAiubnKOggOAYX cbHcSPp0C3WglE0=; b=qBVTTmSZ8hZSlBAV+xaVP+zuAucR3FpPbVF/O0QB1fhg uzA+Sf2DEDlkShkAWQTwFrK0INHk+HSw0BZgws0O4NoAgIQpPtzkyfRnbaiZrBfD 3i8OoL8MEHbKcejaznonHjQTJlHzmFxA7e4Mh0cdwUbE91bC8ZzD8C84Pw/vmH4T JzqEDijv0dkpfNfJywOQPggkeyvgfsaLi66sy2xC3CBZcUk6+Iyjx2EOgoGdr3qM mZQLPTNavohvrQC7BcjNrl9lnG3LX7qTuY9lNBTjsW1au+GRAlMEnI3Yeh9F7ev6 sfCb2lk413yg2gZxnY6V0pZJc4tceYa0/eoYD5xDKg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkeeggdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghr nhepieehjefhjeevvdeugeehudfghfevudevfeeivddtveeuheffleeiiefftdegueffne cuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghr rghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvshdpnhgspghrtghpthhtoheptd X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:13 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v6 0/7] gnu: telegram-desktop: Update to 5.3.2. Date: Sun, 4 Aug 2024 22:30:43 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello Guix! This patche series update telegram-desktop to 5.3.2, the latest release, which the previous one tries to update it to 5.2.3. The major differences are: * added a new dependency ada * modified two patch file so that they could be successfully applied * added a new phase for telegram-desktop so that they could be built with gcc-final I was trying to build telegram-desktop with a newer gcc, like gcc-12 or gcc-13, but I ran into an issue which is similar to: https://issues.guix.gnu.org/43579. It would be helpful if anyone could give me some guidance on how to solve this issue. dan (7): gnu: xdg-desktop-portal: Update to 1.18.4. gnu: xdg-desktop-portal: Update input style. gnu: Add cppgir. gnu: Add cppgir-for-telegram-desktop. gnu: Add ada. gnu: Add libprisma-for-telegram-desktop. gnu: telegram-desktop: Update to 5.3.2. gnu/local.mk | 3 + gnu/packages/cpp.scm | 23 ++++ gnu/packages/freedesktop.scm | 47 ++++---- gnu/packages/glib.scm | 48 ++++++++ ...gram-desktop-allow-disable-libtgvoip.patch | 6 +- .../telegram-desktop-unbundle-cppgir.patch | 95 ++++++++++++++++ .../telegram-desktop-unbundle-gsl.patch | 31 +++++ ...or-telegram-desktop-unbundle-libsrtp.patch | 7 +- ...-desktop-portal-disable-portal-tests.patch | 56 +++++++++ gnu/packages/telegram.scm | 107 ++++++++++++------ 10 files changed, 362 insertions(+), 61 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch create mode 100644 gnu/packages/patches/telegram-desktop-unbundle-gsl.patch create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch base-commit: efb3e63a2293f92f4790f1e3b498113e1128d8d4 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 04 10:31:51 2024 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:31:51 +0000 Received: from localhost ([127.0.0.1]:56868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacGz-00013W-NU for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:50 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]:60965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacGt-00012m-Jb for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:45 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.nyi.internal (Postfix) with ESMTP id 4B05B13876A6 for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:17 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 04 Aug 2024 10:31:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1722781877; x=1722868277; bh=23+1R76N4MuyR+f6g0L2dF8BBqwBFP+mr+28dnO7yQo=; b= faY/Bpb+DPRta2ftwtiA5Kc+3am3jEf5OXd5RsJ3n8vW1rgDggS3pEvHZsqMOHKg 2Veb/yUV5WxReRZpoPZenyDF9NiYWzrem3WHfKwNpbM5WbRMEw/v1iV7/5BWK5j7 CKmwAaQU385G/SNXOQJpECjNeB/YBQAlqBQQk9Fi6NfjWdkVPS9TdCt66cd7gdmR O6YHlg2Kt9uS7bDj3qriU4B0s3esF2WqJBEU02EbpXdirpHBh4sqTaC4okawlgCs 2bJWGY5jWZCGpuCgRlr6V8G6W2ERMmN6sK8THvdxXgplWUUdD59Z7FXQ6M1haeuK OaJkNFx3+R2nQgC1gQoPGQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1722781877; x= 1722868277; bh=23+1R76N4MuyR+f6g0L2dF8BBqwBFP+mr+28dnO7yQo=; b=o v24KCxyIbls91+HmKTEqC4sk7wyfRpzVGlhjptQh+sFff2PvMjByf9V+M5zAONEt +pNE1Kzy1eNBbulu1myplwuEYoFNEU/vbjs1426CddBRy0TnPzXxoU9G+JAiqmV7 QmKo2/TGRWSLdRf57ZW17xIcj95dt3vFs+iQharB9lBSERI2XbPfNxYCXoqympSO aPMkCE6f12o/bdIFT9Tmz9Pexv1tC5yFbVp1+mH3yAsbFfqw5GzbavGNCdt9WDpt 35wBXoatDCwizBUmiLc9yI5/Hnvhf52rU1CziNUHk/TK4yzALKVCJjSRkvbTeFZz WQABOB/yoa89e6vpOSb/g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkeeggdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesthekre dtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrght thgvrhhnpeehfeekffeiffekueehvdffjeeuvdejleektdeiueelhedtudegieefueeile eggfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehi segurghnrdhgrghmvghspdhnsggprhgtphhtthhopedt X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:15 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v6 1/7] gnu: xdg-desktop-portal: Update to 1.18.4. Date: Sun, 4 Aug 2024 22:30:44 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.18.4. [patches]: Disable portal tests. [native-inputs]: Remove autoconf, automake, libtool and which. Add python, python-dbusmock, python-pytest and python-pytest-xdist. [inputs]: Add bubblewrap. [phases]<#:configure-flags>: Update flags to meson options. Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 25 +++++---- ...-desktop-portal-disable-portal-tests.patch | 56 +++++++++++++++++++ 3 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6d2b14e72d..d8fcb13cfe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2245,6 +2245,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-dbus-group-policy.patch \ %D%/packages/patches/x265-arm-flags.patch \ + %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xen-docs-use-predictable-ordering.patch \ %D%/packages/patches/xen-remove-config.gz-timestamp.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 8e0c5f0cf3..99a4469264 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2024 aurtzy ;;; Copyright © 2024 Dariqq ;;; Copyright © 2024 Wilko Meyer +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -135,6 +136,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages video) + #:use-module (gnu packages virtualization) #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -3048,7 +3050,7 @@ (define-public libportal (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.16.0") + (version "1.18.4") (source (origin (method url-fetch) @@ -3057,18 +3059,21 @@ (define-public xdg-desktop-portal version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav")))) - (build-system gnu-build-system) + "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q")) + ;; disable portal tests since they try to use fuse + (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("glib:bin" ,glib "bin") - ("which" ,which) - ("gettext" ,gettext-minimal))) + ("gettext" ,gettext-minimal) + ("python" ,python) + ("python-dbusmock" ,python-dbusmock) + ("python-pytest" ,python-pytest) + ("python-pytest-xdist" ,python-pytest-xdist))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) + `(("bubblewrap" ,bubblewrap) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("flatpak" ,flatpak) ("fontconfig" ,fontconfig) @@ -3080,7 +3085,7 @@ (define-public xdg-desktop-portal ("fuse" ,fuse))) (arguments `(#:configure-flags - (list "--with-systemd=no") + (list "-Dsystemd=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'po-chmod diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch new file mode 100644 index 0000000000..5e13493613 --- /dev/null +++ b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch @@ -0,0 +1,56 @@ +From b7750fa99c31c5f28ac2053fa154bef4038b5cc0 Mon Sep 17 00:00:00 2001 +From: dan +Date: Tue, 2 Jul 2024 19:37:38 +0800 +Subject: [PATCH] tests: remove portal tests. + +--- + tests/meson.build | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index a2dafee..bcd87be 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -181,18 +181,6 @@ portal_tests = [ + + test_env = env_tests + test_env.set('XDG_CURRENT_DESKTOP', 'test') +-foreach p : portal_tests +- test( +- 'test-portals-@0@'.format(p), +- test_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/portal/@0@'.format(p)], +- depends: [test_backends, test_portals], +- env: test_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + # Split the portal tests into one test per portal, this makes debugging a lot + # easier. +@@ -204,18 +192,6 @@ portal_limited = [ + + limited_env = env_tests + limited_env.set('XDG_CURRENT_DESKTOP', 'limited') +-foreach p : portal_limited +- test( +- 'limited-portals-@0@'.format(p), +- limited_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/limited/@0@'.format(p)], +- depends: [test_backends, limited_portals], +- env: limited_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + if enable_installed_tests + install_data( + +base-commit: 11c8a96b147aeae70e3f770313f93b367d53fedd +-- +2.41.0 + -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 04 10:31:53 2024 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:31:53 +0000 Received: from localhost ([127.0.0.1]:56870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH2-00013n-Bz for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:52 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:41939) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacGw-00012r-6o for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:46 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.nyi.internal (Postfix) with ESMTP id E6EC011482FB for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:19 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 04 Aug 2024 10:31:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1722781879; x= 1722868279; bh=7r2BbvPiuTVQMCZ741IpmIWNI/RdhItLoL+dzqvdp6A=; b=A azX3ozaW3DNE36jHFmF0TOw933F8kGMHQbkYdk4OZ4JAOtTYorttxjEvp25e900/ UemWlNv9g98STF8oqf4bfXO67xfE3ddtGIfxuKU+UhPWfYRDSNIQX5DV/savtS3D 6qY/1FWaPkd8jfhe9QHJpZMDlWCWzTuDY7fORysuc9gdtbrKBKiUWGb8wA9ayC84 h+Nj16A1a8zLDdzYlmCAceg6x2mC7qzdcvY4SoVWY4V/dPdCi6c7CVqTu3h2f+Vd gGb02vk0QJmsm7kdqg4lPpSZ31shUk26MLLe8cjuLgiu0ZEoQvODb5zrrMcor5eO A7/nhupf+0a1+sfq2kiCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1722781879; x=1722868279; bh=7r2BbvPiuTVQM CZ741IpmIWNI/RdhItLoL+dzqvdp6A=; b=QGKOd0b9mVoldWPD3uesXd9qypq7i aKvwYAEHvDedmOA4bEUCw+fURjYKkBXwOMSR2S5QGMrwZbHDkGO4eKl38YPoRfYe dzqHf1nb8xa0PmS5pQPY0pGvvfmiGHQkCHuApECLMMsY3TBztzKQVshRx71Cwixi K5HtS3JByuHTa1JP3VL27rzyM73MjXeVZJv4sXRcVdZ4hDbI77caBbHMgEn44yF6 /ohe9R35QVpym3jaEL46GYnoXrrLXX4brQQOW6aWX6DzgguWgTUSOthXG9H7bsHv v6ZyZRrjVNgadVFj7sH4ASONb4W2IiT2cQaLst+7p/g7vpplsexXxw9NQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkeeggdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepfeffffdtheettedvleeiheegheetvdetteehgfetiedvteeggedtjedtuddule dunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihes uggrnhdrghgrmhgvshdpnhgspghrtghpthhtoheptd X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:18 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v6 2/7] gnu: xdg-desktop-portal: Update input style. Date: Sun, 4 Aug 2024 22:30:45 +0800 Message-ID: <7a857b480ff7c3a055b03a1f780468657b1373b0.1722781401.git.i@dan.games> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update input style. Change-Id: Iec0630cd945dfcd4db67af30211cbfd4d058766d --- gnu/packages/freedesktop.scm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 99a4469264..d06ce2a48a 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3064,25 +3064,25 @@ (define-public xdg-desktop-portal (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) (build-system meson-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("glib:bin" ,glib "bin") - ("gettext" ,gettext-minimal) - ("python" ,python) - ("python-dbusmock" ,python-dbusmock) - ("python-pytest" ,python-pytest) - ("python-pytest-xdist" ,python-pytest-xdist))) + (list gettext-minimal + (list glib "bin") + pkg-config + python + python-dbusmock + python-pytest + python-pytest-xdist)) (inputs - `(("bubblewrap" ,bubblewrap) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) - ("flatpak" ,flatpak) - ("fontconfig" ,fontconfig) - ("json-glib" ,json-glib) - ("libportal" ,libportal) - ("dbus" ,dbus) - ("geoclue" ,geoclue) - ("pipewire" ,pipewire) - ("fuse" ,fuse))) + (list bubblewrap + dbus + flatpak + fontconfig + fuse + gdk-pixbuf + geoclue + glib + json-glib + libportal + pipewire)) (arguments `(#:configure-flags (list "-Dsystemd=disabled") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 04 10:31:54 2024 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:31:54 +0000 Received: from localhost ([127.0.0.1]:56874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH3-000147-DY for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:54 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]:43211) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacGy-00012z-T3 for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:50 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.nyi.internal (Postfix) with ESMTP id 97F4A1387AFB for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:22 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 04 Aug 2024 10:31:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1722781882; x=1722868282; bh=A0tcpwjdwvTe0AC8pV/Q+t+FXDxdKrr8QRbVovQZxY8=; b= TucCmUDjz8VS1RsQYnSgMwmZiS46uKyH2NrTB4BrGJ3i4TsT2tC8/j4pKNryjMfD OZKnjQiHgDpdCNY1ECknRr6XMlvkQpdLtMbZLE9qxSf/NYlYerMmlySvDts/Rfk6 PVnkPHh/V37IWT2ngDK6OpWqbMRtRjIMLLiHmc36YqPCAISEf9kR7NVkaMY9LXIF nvShIj4u6Lo1jSUihvAwUtVS8InT2RsGCcP7sWef63LlkKdQiNMVlK3e6o56KZEO avy+a/Hp6FO5sk5hhxCBFIyIFXCOEm1jm7rgnadk48unnGP2hnflG+KABWQl+Lge n4ib0Lldjwe6HpVV8HnT3Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1722781882; x= 1722868282; bh=A0tcpwjdwvTe0AC8pV/Q+t+FXDxdKrr8QRbVovQZxY8=; b=U 1dAiCES6S+YrSEZ5bsqDsKn4v8HjahVCd5lFB2XNxQntto4bgz1eyBJ1OvnexhfK yJgmDUMANLlb79I2eQzm89+5VIIeH1S0LhnNyMfYTks1AWAh/ckApTtLIjJzlu6G L8hcjBEFWfSNyv36xt2Eh/IymsZqfwhcKNQliUUVqVbQcR0VMMUk6JS/r38JasAZ Nihm0XUamFY2131kz5sI5Ro9m/7It/dOCaz3fTTNFFxZudwt1ZaoVu3lDyzX1KQG cJAreuEbqfv62IUWQ7KRStsHaK29nWXsU7njg9dYJFK11dSrOh2xoDedZBp65PsG GneawKaVRtpsS/URetSgA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkeeggdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesthekre dtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrght thgvrhhnpefgtedttdfgtddtieffudeffeelgedtuddtvdevheektdeifedvieefieffie ejueenucffohhmrghinhepghhithhlrggsrdgtohhmnecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvshdpnhgspghrtg hpthhtoheptd X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:21 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v6 3/7] gnu: Add cppgir. Date: Sun, 4 Aug 2024 22:30:46 +0800 Message-ID: <080c4a79813c969bc7de849993632a23e2a20e5c.1722781401.git.i@dan.games> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/glib.scm (cppgir): New variable. Change-Id: Ic4510be6d05b7b3977aa457c6a7fec382c1d3a88 --- gnu/packages/glib.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b11046f05d..3a44207afe 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Saku Laesvuori ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,6 +72,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) @@ -1594,3 +1596,30 @@ (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 "2.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cj4myqzb28hgb7zlxlba9y8n4ysxkvv2y9wy6f7ps58mr18h7bl")))) + (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 "GObject introspection C++ binding wrapper generator") + (description "cppgir processes .gir files derived from GObject +introspection annotations into a set of C++ files defining suitable +namespaces, classes and other types that together form a C++ binding.") + (license license:expat))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 04 10:31:58 2024 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:31:58 +0000 Received: from localhost ([127.0.0.1]:56878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH6-00014Q-Le for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:57 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:52933) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH1-00013F-D3 for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:51 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 16B9C11482C5 for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:25 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 04 Aug 2024 10:31:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1722781885; x= 1722868285; bh=QphVA2QQiWZbYnBq6lhAgKH6ivQYdGWmg1iKe8I3cJg=; b=f cq53P8PDkA04e//MDfURF7XaNX1MmxzI0DpBdYXQjv7DULdi0oOjdxLruQRGrLvn az5006xCZwqKgtbiPT+xSbhPtLcWMVtLIpow/3UHWW4TErnFxUAQiqw2vZAvk9zY OriAenEVB/X4ppo+mY2y65Zp+2Q0/+iTV5+J2mLgZYVsoMtn3RA5MfmVmGTnwoOI 0Ru7+mdcbUSrx+Xy3b+72KY2t89HBnSdR7E5JTvTiS/iTKcWQWzaUJcZhYtydxTZ Wy0yBRMce0SOdPxQ3VvI+SlQJAts6qNZx7q0LfOjS+mD4rFLGvy7sr1QPeE06hXi SahxhUWkQ03qbIdzLakGQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1722781885; x=1722868285; bh=QphVA2QQiWZbY nBq6lhAgKH6ivQYdGWmg1iKe8I3cJg=; b=QtiUpPIjdGydGXorbkHHkfw7OYnuk mTwD3YjOH9D8L9UK1gMop2r/KpE8Jrrj8atuK5IwHgoQaNf+w1oyuNIdUAIMqKCA tdHvSFl2TvSG35tDsrMe4ebzx17Jc//VgWEg2UCA0GpwWLhdj54PgVqCf3HqvgvW xN6yam1foPXHbZSQ8q1t8o9RCbztKcKKviDuCwHqI6KKFe8i4h/wHCf2EqkAD8g9 IfWeEAUjY/czfT9w+DXr9dWy4+7P53P+mLEVsou2Naewx1jlJok3HyBz/Wv7Fmdg eqWb/QwDuIsHCKXRLh5GYuj7jvvyD4fl7qthhXbOL0f0eRKae50qRpXZQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkeeggdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepleelgffffeeigfelteduleeigfejvdetuefggfehgffgieevhfdvveeffedtle ejnecuffhomhgrihhnpehgihhtlhgrsgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgtph htthhopedt X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:23 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v6 4/7] gnu: Add cppgir-for-telegram-desktop. Date: Sun, 4 Aug 2024 22:30:47 +0800 Message-ID: <79e90f0617407bd98ce3d554791e825dd26e420c.1722781401.git.i@dan.games> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/glib.scm (cppgir-for-telegram-desktop): New variable. Change-Id: Ib9ca3bd376f32d13939adabd2c52e1eb24e2ddcb --- gnu/packages/glib.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 3a44207afe..29ac8d5542 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1623,3 +1623,22 @@ (define-public cppgir introspection annotations into a set of C++ files defining suitable namespaces, classes and other types that together form a C++ binding.") (license license:expat))) + +;; telegram-desktop requires a more recent version of cppgir +(define-public cppgir-for-telegram-desktop + (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") + (revision "0")) + (package + (inherit cppgir) + (name "cppgir-for-telegram-desktop") + (version (git-version "2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fa9nf4yljfarihaqj5kd98yysrky7q316mh6l5b1rq39ga15k9b"))))))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 04 10:31:59 2024 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:31:59 +0000 Received: from localhost ([127.0.0.1]:56882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH8-00014c-21 for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:58 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]:55177) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH3-00013R-UM for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:54 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.nyi.internal (Postfix) with ESMTP id A476A13876A6 for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:27 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 04 Aug 2024 10:31:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1722781887; x= 1722868287; bh=QygqV4XkWIW9xHDHZxhR6fSCNOtcRrv3z1nmct8Hloc=; b=P wDIHixhGEHfrYUE86yqWwlnFG5n7y2mIx9ngKYhGbp7aoK8fKi2Ki4ICahGs9lhy rm04b9mgIc/GUuByA6byveS4VBPwGpGKxA74L1T6nEMvdt12c0bdc1iJmnNT0TzM jIKCVAG8q1V8wT+8Z10lqOZQPas4tOqdbwA/UjrWHcmuup7T1QnmmJpnwcxFgOyK W7QZg2DUp+PihUz6AZ3et3b2OwNy2F/rydl3cxcYUMCYwNq4w/tQFdbZln7TVLm9 BH6mza4IubCYMHyR7MWO+ox5ldSvq/iq4PwWflvX07NmP9Tmn7Urj/CZcl54CYVk 8YyB3nh72vR6zkccttmlg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1722781887; x=1722868287; bh=QygqV4XkWIW9x HDHZxhR6fSCNOtcRrv3z1nmct8Hloc=; b=sxBEKolj73c0DNsCHolNChfRJvk3B 9SUGPQDaUmGVr2S5o2v4FTeFMdf4d8YZhFB6gkkKIHB89wRvbslhVJOQqHs6wYCP 4rrH2+asMVUVuNGDMp8rBNnePtgNrqaiSeCWl6/7L8Tbmc81d2S4CgTQSGI0yroP YSox4Lb0/44viQtXKSJ4/JaeAtROSD6abMYL58iUHVLYc9cx9ORo/EKiOpU/zYyG HA6ojEEGj1FdRyegThhZszgeP/5pR0cpxTJCTyq2vkZqXs1VkCOsdoZT0kk8UheQ oMfsl5I3th9vNAZRqbcOJks59cjN2Mq2ToWuo7i4FnLQ4J0lgvU9HdoEw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkeeggdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgtph htthhopedt X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:26 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v6 5/7] gnu: Add ada. Date: Sun, 4 Aug 2024 22:30:48 +0800 Message-ID: <08f02411d27405aa3f34de957a34a25df21c8acc.1722781401.git.i@dan.games> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/cpp.scm (ada): New variable. Change-Id: I9924bba53ed58bbf306bf073c9724cd7bd6f570a --- gnu/packages/cpp.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index c1c2a4028b..de607f4756 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -3244,3 +3244,26 @@ (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 ada + (package + (name "ada") + (version "2.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ada-url/ada.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 "1d2mj2zmw0dkkgas3bap2xwlizsy0qdpqwcavb4hqx7xp5xnm7yn")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "-DADA_TESTING=OFF" "-DADA_TOOLS=OFF"))) + (home-page "https://github.com/ada-url/ada") + (synopsis "URL parser") + (description "Ada is a fast and spec-compliant URL parser written in C++. +Specification for URL parser can be found from the WHATWG website.") + (license license:gpl3+))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 04 10:32:03 2024 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:32:03 +0000 Received: from localhost ([127.0.0.1]:56886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacHB-00014x-3U for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:32:01 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:47971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH7-000140-Jh for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:58 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 2174911482FB for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:30 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 04 Aug 2024 10:31:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1722781890; x= 1722868290; bh=ItaBuPVYCw8srw68Q2isEf5uLqYYAQXlEm7GFf06g84=; b=e jMvLK7+FI/fRZl/haDXfWCGCfmZaz61dG6FklE23bJQ/1J5mc8NzOl2w1lm5VpHu daQtceghOf7GUZKUG3q+uashz+UuAssHFxJ0KEmRDtVS/K6B+ubhpvYjexDuW7+C A3boyWZHzyZqq7MB4WdlGE3hvBYIt4jLmW51qH0fNsWQKUSXZTpJE6RfwCz8QPmy FB236ApFCEr1oxS0cmIVXrA69HfvQZQC0gRoRk7pcoO339VoVu8LvU/vhIppeDtU xV70aHW8JHVr3w9S/Sy4J/XN5o49d2aX5MkkJKdrcPV+Vf6iKRTThfv0Qoq9WVvy hn850KTdzjUhFG3BbZRug== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1722781890; x=1722868290; bh=ItaBuPVYCw8sr w68Q2isEf5uLqYYAQXlEm7GFf06g84=; b=TKbjZ3hpb9894s2CnLDbURApgEIxi yZfMO1LQPpo45TRt8iiWQQ5ehXVJoy7jgPgQQHD6EdvIZYsetp8rXlj00hBIEEoH tZfnBwLYoApGaTbkfYucaHIq7SrgVmvibX5WF/wCcsclDkxkai1YcQBSGAA+vDe3 ikUKw3uirN5U6YrcpQa1it/TdOHk2wfZqYxTT1ZX185ML7wCj2Z8oJPW9dQMHEea hyv3htisYoaMumxc8j8w2BPQ1eX2mQSy2sSIGT8526xLQoYmejLq1gunNQsK5Ye0 8mfwvcRange/tJ5GTGNj30NZb8FoRkNzZB1nYxrJYNcAYUn4JbT9pEr3A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkeeggdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgtph htthhopedt X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:29 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v6 6/7] gnu: Add libprisma-for-telegram-desktop. Date: Sun, 4 Aug 2024 22:30:49 +0800 Message-ID: <0a0d673493941e0300795c8fdf4576dff0a24e71.1722781401.git.i@dan.games> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/telegram.scm (libprisma-for-telegram-desktop): New variable. Change-Id: I855b463993654a8cad491c7b56c9581b3083f5e4 --- gnu/packages/telegram.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index a77164b93e..88b4baa0da 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -400,6 +400,18 @@ (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 "23b0d70f9709da9b38561d5706891a134d18df76"))) + (file-name + (git-file-name "libprisma-for-telegram-desktop" "5.3.2")) + (sha256 + (base32 + "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) + (define-public telegram-desktop (package (name "telegram-desktop") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 04 10:32:09 2024 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:32:09 +0000 Received: from localhost ([127.0.0.1]:56891 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacHH-00015e-0b for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:32:08 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]:43067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH9-000149-8o for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:32:01 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.nyi.internal (Postfix) with ESMTP id 00D9D1387EAA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:33 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 04 Aug 2024 10:31:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1722781892; x=1722868292; bh=zsbd6Ongk40JljG/9DuO3P/nI+MVwHbBKOPxA1X8Bwk=; b= Po/WvPA6ZzqwVpIxva3x+v2XyZOEGbwuHe/HgT30Wx2b9X5BBgNAjEL5GopwuDDd fwsG+j9+hIp5XNP+a9Gc03MdZ6q3QpWQ166zWpj2N5Gz5e8RybMCMy+785DmUWWL P3n70laFQAz57odCiC/q3sJZxfo6TTtKmFb3n/9fPKFoEeXKEz9I1ELRTGFEv8r7 tX1Mf+yBdfXfuy8/mKmttnUkuXI1Q31A5pSE2EmFO4yxCr/dYJVEksDIeIf0PMSp PCmXyuMasUEqpGGHaC+UJFQmMEVJ03MQdf0f4yHLAx656dW9a+j21Ra/G9kfa19W wVuXpobtL2jkUqmR3r1GqQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1722781892; x= 1722868292; bh=zsbd6Ongk40JljG/9DuO3P/nI+MVwHbBKOPxA1X8Bwk=; b=f +QEn0Y1ggCu6XviQbasjAmgNNY1Kh8sA74XP7EZzkuBmlC78gZZeIdwQiAPdsb8c hGf3Jcxk+YhVUZYsB5ssLcKRRz9/2oOkJREod391MCUN5OgLuiOY7l0zI26vdHn6 lUPb2UUcIuzX+Oc3qj0/jxlXvMCja720k9Ntvo9W5s1TrWx5aiTOKmGqfB3jWu92 vPs2L7Mc/DUBsPoP67aRx69sOljLrRekWKsL2KIa+MRqUsxzMQ9fjChE3nYJsSdw A3oNAaf9xX09B4ypc2z6achxL/Uo5uF0T5846c114kyRrzdrETd6xR4KQMlphNMD SiqN1MqPb92uMmgjZgb7Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkeeggdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecufghrlhcuvffnffculdduvddmnecujfgurhephffvuf ffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhg rghmvghsqeenucggtffrrghtthgvrhhnpeeikeeuvddtveelgeehudehleehteffhffhff fhvdevgeevkeehhfffieeuieegieenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhk ihhtfigrrhgvrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepihesuggrnhdrghgrmhgvshdpnhgspghrtghpthhtoheptd X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:31 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v6 7/7] gnu: telegram-desktop: Update to 5.3.2. Date: Sun, 4 Aug 2024 22:30:50 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: Update patch file to match upstream changes. * gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch: Update patch file to match upstream changes. * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. * gnu/local.mk (dist_patch_DATA): register them. * gnu/packages/telegram.scm: (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)[origin]: Add patches to unbundle gsl and cppgir. (libprisma-for-telegram-desktop): Use %telegram-version. (telegram-desktop): Update to 5.3.2. [#:phases]: Add libprisma-for-telegram-desktop. : New phase. : New phase. : New phase. [native-inputs]: Add ada, gobject-introspection and xdg-desktop-portal. [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite. Change-Id: I78df3434a2cd04afc54107b7fecd5e5a8df85564 * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: Change-Id: I086ca5016477b5e7713985c4ade4e2828b98a6ca --- gnu/local.mk | 2 + ...gram-desktop-allow-disable-libtgvoip.patch | 6 +- .../telegram-desktop-unbundle-cppgir.patch | 95 ++++++++++++++++++ .../telegram-desktop-unbundle-gsl.patch | 31 ++++++ ...or-telegram-desktop-unbundle-libsrtp.patch | 7 +- gnu/packages/telegram.scm | 97 ++++++++++++------- 6 files changed, 197 insertions(+), 41 deletions(-) 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 d8fcb13cfe..6bce751788 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2139,6 +2139,8 @@ 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-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-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch index a603bc9d72..1354a1e9cd 100644 --- a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -47,10 +47,9 @@ diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/ca index 5fe9ac677..bebf48e70 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp -@@ -39,8 +39,10 @@ class InstanceImpl; +@@ -39,7 +39,9 @@ class InstanceImpl; class InstanceV2Impl; class InstanceV2ReferenceImpl; - class InstanceV2_4_0_0Impl; +#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP class InstanceImplLegacy; void SetLegacyGlobalServerConfig(const std::string &serverConfig); @@ -58,10 +57,9 @@ index 5fe9ac677..bebf48e70 100644 } // namespace tgcalls namespace Calls { -@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register(); +@@ -56,6 +58,8 @@ const auto Register = tgcalls::Register(); const auto RegisterV2 = tgcalls::Register(); const auto RegV2Ref = tgcalls::Register(); - const auto RegisterV240 = tgcalls::Register(); +#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP const auto RegisterLegacy = tgcalls::Register(); +#endif 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..a24dbe25bb --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch @@ -0,0 +1,95 @@ +From a5c42e07ae223d440ff11347e0cf1fd58fd383df Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 1/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/CMakeLists.txt | 4 +++- + external/glib/generate_cppgir.cmake | 7 ++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt +index 3c6fe4be..c862705f 100644 +--- a/external/glib/CMakeLists.txt ++++ b/external/glib/CMakeLists.txt +@@ -13,9 +13,11 @@ function(add_cppgir) # isolate scope + set(BUILD_EXAMPLES OFF) + add_subdirectory(cppgir EXCLUDE_FROM_ALL) + endfunction() +-add_cppgir() + + include(generate_cppgir.cmake) ++if (NOT CppGir_FOUND) ++ add_cppgir() ++endif() + generate_cppgir(external_glib Gio-2.0) + + find_package(PkgConfig REQUIRED) +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index c15d3f9e..9b0a5ac8 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 2.0) ++ + function(generate_cppgir target_name gir) + set(cppgir_loc ${cmake_helpers_loc}/external/glib/cppgir) + +@@ -17,6 +19,9 @@ function(generate_cppgir target_name gir) + ${cppgir_loc}/data/cppgir.ignore + ${cppgir_loc}/data/cppgir_unix.ignore + ) ++ if (CppGir_FOUND) ++ set(ignore_files) # rely on default ignore list ++ endif() + + set(gir_path) + if (IS_ABSOLUTE "${gir}") +@@ -33,7 +38,7 @@ function(generate_cppgir target_name gir) + --class + --class-full + --expected +- --ignore ++ "$<$:--ignore>" + "$" + --output + ${gen_dst} + +From eed39522952c15f448c54290454806dd011c4996 Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 2/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/generate_cppgir.cmake | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index 9b0a5ac8..2ad82277 100644 +--- a/external/glib/generate_cppgir.cmake ++++ b/external/glib/generate_cppgir.cmake +@@ -15,11 +15,12 @@ function(generate_cppgir target_name gir) + + set(gen_timestamp ${gen_dst}/${target_name}_cppgir.timestamp) + +- set(ignore_files +- ${cppgir_loc}/data/cppgir.ignore +- ${cppgir_loc}/data/cppgir_unix.ignore +- ) +- if (CppGir_FOUND) ++ if (NOT CppGir_FOUND) ++ set(ignore_files ++ ${cppgir_loc}/data/cppgir.ignore ++ ${cppgir_loc}/data/cppgir_unix.ignore ++ ) ++ else() + set(ignore_files) # rely on default ignore list + endif() + 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..f89d326a5c --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch @@ -0,0 +1,31 @@ +From a3ac6df0441b4caca28b1df87febc420e18942ce Mon Sep 17 00:00:00 2001 +From: Zephyr Lykos +Date: Mon, 23 Oct 2023 15:55:24 +0800 +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 8eaf19c5..344f9488 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) diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch index 486f0b1aa5..3317d0a9c1 100644 --- a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch @@ -17,10 +17,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index af7d24c21..66bec8fdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2647,6 +2647,9 @@ if (TG_OWT_USE_PROTOBUF) - list(APPEND export_targets proto) - endif() - +@@ -2647,5 +2647,8 @@ if (APPLE) + libyuv + ) +if (LIBSRTP_FOUND) + target_compile_definitions(tg_owt PRIVATE HAVE_LIBSRTP) +endif() diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 88b4baa0da..486e742d5e 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2023 Lu Hui ;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; Copyright © 2024 Ricardo Wurmus +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,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) @@ -82,11 +84,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 "5.3.2") (define libyuv-for-telegram-desktop - (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") - (revision "2439")) + (let ((commit "04821d1e7d60845525e8db55c7bcd41ef5be9406") + (revision "2440")) (origin (method git-fetch) (uri (git-reference @@ -97,67 +99,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 "08de4f18f5e4459689957b3aa115e10d8cbef9d6"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) + (patches + ;; https://github.com/desktop-app/cmake_helpers/pull/320 + ;; https://github.com/desktop-app/cmake_helpers/pull/305 + (search-patches "telegram-desktop-unbundle-gsl.patch" + "telegram-desktop-unbundle-cppgir.patch")) (sha256 (base32 - "0y96mvzs113zh8bdw1h3i6l0pgwg93rigrday8kfdg4magz686k6")))) + "0a2y9dpszw686lk83k3psvid6kqrwnx7z4zcb35xahn4ab3pp7il")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "1a969faa0afb29d53af03e530775eccdfb8433f1"))) + (commit "0af136124083369073b8fdaf45f0816fd2b10bad"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1xmw8dfm51p5g20rlmzqnr72a14ngyxwq09an8clf1v5s6mmwvak")))) + "057bwn9smrgnyfb1vraf50ihbkhjc4d72msl7vnbqc4h5sg8dav9")))) (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 "ca4503b3075fcaed5719b6ff1f40e40d14d08d95"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83")))) + "1clzv85gbix9km2id2c4r0dpsc6jjrybrs4z6bpzfriwahhd64a5")))) (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 "c1d6b0273653095b10b4d0f4f7c30b614b690fd5"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "06mzafnjpfr5ih297dh7bxm6bgpg0wy0gv2r2732n5szyrg9sdl6")))) + "1sxn3qccsfbx1289z0fdrb4cggs16a8r75ic6wi81c6lnkrdi3wl")))) (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 @@ -188,24 +195,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 "0b7622ff38778e9cd03d3997de59351973480a1f"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "147xbbcza5q4wcdipk5jplajzkc48971kg2s7qv5jlz33sxkw1lq")))) + "0s9fjxpxxvj1xgzg3sfw6079blgmdvbb5cy6wb921sqaqwf52j6x")))) (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 "ccdc72548a5065b5991b4e06e610d76bc4f6023e"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) + "0b11ix95dzpkz335q0a6b5yg8qhj33s4fgj9ppl37pszcqq1j3wi")))) (define lib-tl-for-telegram-desktop (origin @@ -224,52 +231,52 @@ (define lib-ui-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "37531086ec21a8569deddedb11b402f8a3157b90"))) + (commit "8db5d1aa533334c75ed2598ecf3607768ae9b418"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0")))) + "0zkxjqg112wp1120vqc8qw0hm9dwhf51p8v9mrc76i4p1bd7m571")))) (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "b68a95ad4d1ae9a1827671100a7fd76cbe448c3f"))) + (commit "8751e27d50d2f26b5d20673e5ddba38e90953570"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1c8jwdnn26n13yp0rp0l71q6xlxa6wp3cspbm3pnghw964jwgp3z")))) + "0f05pqb83qckghzlhnwqbi9qfi9xw7qsv8jampl4qyaq9q0w9p20")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "f632fc84cbc62ae8abbbd05f81d472757a337c11"))) + (commit "c27c69953db52cfcb56abc3d422764f0fb4c2152"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i")))) + "0r86c5r0dhrvvjaaava5jfayk3gmimnb74b6dbwmzd6dcw35nfip")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "2e2797648aac2588e7fe479c2e8b4455ec65c5e6"))) + (commit "9bf4065ea00cbed5e63cec348457ed13143459d0"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) + "1p563a11w8jrid96xf03dg6j39ciz28n5f4r6g28lxhiphbqzfym")))) (define-public webrtc-for-telegram-desktop - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") - (revision "389")) + (let ((commit "c425281150317753d7bc5182c6572abe20f9a784") + (revision "456")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -285,7 +292,7 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) + (base32 "1fj48iq56awnrckncy1qc3zhdzifl725hbb6an7wg2v3zmagvrwn")) (patches (search-patches ;; https://github.com/desktop-app/tg_owt/pull/123 @@ -407,7 +414,7 @@ (define libprisma-for-telegram-desktop (url "https://github.com/desktop-app/libprisma") (commit "23b0d70f9709da9b38561d5706891a134d18df76"))) (file-name - (git-file-name "libprisma-for-telegram-desktop" "5.3.2")) + (git-file-name "libprisma-for-telegram-desktop" %telegram-version)) (sha256 (base32 "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) @@ -427,7 +434,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) + (base32 "0pw11f3a616niimq9xpqxh2mcrd88q3dw22m3avrn90lmqb7mp12")) (patches (search-patches ;; https://github.com/telegramdesktop/tdesktop/pull/24126 @@ -493,21 +500,45 @@ (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 'unpack-additional-sources 'use-system-xdg-desktop-portal + (lambda _ + (substitute* (list "Telegram/CMakeLists.txt" + "Telegram/lib_base/CMakeLists.txt") + (("\\$\\{third_party_loc\\}/xdg-desktop-portal/data") + (string-append #$(this-package-native-input "xdg-desktop-portal") + "/share/dbus-1/interfaces"))))) + ;; has to remove this constexpr otherwise cannot compile with gcc-final + (add-after 'use-system-xdg-desktop-portal 'patch-libwebview + (lambda _ + (substitute* "Telegram/lib_webview/webview/webview_interface.h" + (("constexpr ") "")))) (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 (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list `(,glib "bin") + (list ada + `(,glib "bin") + gobject-introspection `(,gtk+ "bin") pkg-config - python-wrapper)) + python-wrapper + xdg-desktop-portal)) (inputs (list abseil-cpp-cxxstd17 alsa-lib + boost c++-gsl + cppgir-for-telegram-desktop crc32c + expected-lite fcitx-qt5 fcitx5-qt ffmpeg -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 04 10:50:19 2024 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:50:19 +0000 Received: from localhost ([127.0.0.1]:56948 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacYs-0001zB-NI for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:50:19 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:45137) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacYq-0001yf-FT for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:50:17 -0400 Received: by mail-ed1-f65.google.com with SMTP id 4fb4d7f45d1cf-5b8c2a61386so2589774a12.2 for <71897@debbugs.gnu.org>; Sun, 04 Aug 2024 07:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722782929; x=1723387729; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=/82cr5C5o8lVHpA/Yk15MgEg7QyecXQ/OjlZrFuHk/c=; b=DGdrhbCZa/lCghrKRJEoidITS3EZyVfY9FTDrMKgKnVLZ+4owp5dcTNFT6ekWS+S2J Y8GcuYIMmpddjM4oPyTPtEzJ67nUQ/WSkqCBUAm6n1ei78lEIlb9uTqNAqPUxhgdg/zR Tba44vgx2G858YYDHgZ1QyfHtoLJsAQNvuMvnMckjXSraBReXThwvhBLEurF5kXUaf4g WFG1tKwdkFoi52mjMpCvvWoBSVbJTZ8M23y/Jxl06jP3DhcwaluUPh0eYdX6KWiwekuN DeqmIRNqli/B7NpE4ku9fMC3tYRFTv4K3iha8Ceu4MRAyjDcf1M6j5wvbY3rvEMGbAEA chwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722782929; x=1723387729; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=/82cr5C5o8lVHpA/Yk15MgEg7QyecXQ/OjlZrFuHk/c=; b=rI+5z7ZswgCs6lq9sROFwOw8CuhQSN/qNyDTiYHoMvlyeH1ykUJKLvkX89r0i7m66z hVf3q/SeJ42g1J+RtwS9x6OawlpkOIyoKTGYCxXtt4AFuwQFefiWSHFcBznCxboujTW9 V77zGEy2oK+zuHRsqoL/MYXktBe3LwdRo1h91tcv8NKEE/GMk/xday+3cm9MZCcnBqlM ONLLHIdUumWlTew8+RvDqgUdXBZgJJ7vCfabglP0su8ikfViG0Wzw672Okjm7+shM4W+ OsUk2Er8Tu/K9A4Hx5kswSxWFsbr+BvJuvqlk/qevyBdzTWVBVXZW5EWENk6NA/8+RdM uRTg== X-Forwarded-Encrypted: i=1; AJvYcCUxsS9u8uc6vcIkcci0MYim+ZYIxr1D3lNLAQ0PWbbFSduEEEkKFN1pvFvsb7NAQpksyR8TML28qwaqtH6/j6F41JPx9W8= X-Gm-Message-State: AOJu0YzQoDm2bTxhgFvNuthqcxqIRj3NbbNtRLlzW8GJX4fXZixOnGyi d1t6baw16bTfi3N5N7GPdkYxnCQ1KePG3wP/Q/w/OzEs/J7sJUi1 X-Google-Smtp-Source: AGHT+IFnohv4EquV6V2JFfwiTP9LwUFFJ3eHnBJZV9VufYgPS1hZ6cZ9OJhcx4knqpVbegq/D4qVBg== X-Received: by 2002:a05:6402:a50:b0:578:60a6:7c69 with SMTP id 4fb4d7f45d1cf-5b7f5413b46mr5942288a12.30.1722782929043; Sun, 04 Aug 2024 07:48:49 -0700 (PDT) Received: from lumine.fritz.box (85-127-20-124.dsl.dynamic.surfer.at. [85.127.20.124]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5bad7df314asm1165132a12.4.2024.08.04.07.48.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Aug 2024 07:48:48 -0700 (PDT) Message-ID: <9ebca96d495c13fa2a862fc549a8b66bd09811f4.camel@gmail.com> Subject: Re: [bug#71897] [PATCH v6 5/7] gnu: Add ada. From: Liliana Marie Prikler To: dan , 71897@debbugs.gnu.org Date: Sun, 04 Aug 2024 16:48:47 +0200 In-Reply-To: <08f02411d27405aa3f34de957a34a25df21c8acc.1722781401.git.i@dan.games> References: <08f02411d27405aa3f34de957a34a25df21c8acc.1722781401.git.i@dan.games> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Sonntag, dem 04.08.2024 um 22:30 +0800 schrieb dan: > * gnu/packages/cpp.scm (ada): New variable. >=20 > Change-Id: I9924bba53ed58bbf306bf073c9724cd7bd6f570a > --- > =C2=A0gnu/packages/cpp.scm | 23 +++++++++++++++++++++++ > =C2=A01 file changed, 23 insertions(+) >=20 > diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm > index c1c2a4028b..de607f4756 100644 > --- a/gnu/packages/cpp.scm > +++ b/gnu/packages/cpp.scm > @@ -3244,3 +3244,26 @@ (define-public tl-optional > =C2=A0the std::optional for C++11/14/17, with support for monadic > operations added in > =C2=A0C++23.") > =C2=A0=C2=A0=C2=A0=C2=A0 (license license:cc0))) > + > +(define-public ada > +=C2=A0 (package > +=C2=A0=C2=A0=C2=A0 (name "ada") Given that ada is also a programming language, perhaps we should play it safe and name the package "cpp-ada-url-parser" > +=C2=A0=C2=A0=C2=A0 (version "2.9.0") > +=C2=A0=C2=A0=C2=A0 (source > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (origin > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (method git-fetch) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (uri (git-reference > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 (url "https://github.com/ada-url/ada.git") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 (commit (string-append "v" version)))) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (file-name (git-file-name nam= e version)) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (sha256 (base32 > "1d2mj2zmw0dkkgas3bap2xwlizsy0qdpqwcavb4hqx7xp5xnm7yn")))) > +=C2=A0=C2=A0=C2=A0 (build-system cmake-build-system) > +=C2=A0=C2=A0=C2=A0 (arguments > +=C2=A0=C2=A0=C2=A0=C2=A0 (list > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #:configure-flags > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #~(list "-DADA_TESTING=3DOFF" "-DADA_TOOL= S=3DOFF"))) We should enable testing, even if we need to patch the cmake files to unvendor inputs. > +=C2=A0=C2=A0=C2=A0 (home-page "https://github.com/ada-url/ada") It looks like the home-page is instead https://ada-url.com/ > +=C2=A0=C2=A0=C2=A0 (synopsis "URL parser") > +=C2=A0=C2=A0=C2=A0 (description "Ada is a fast and spec-compliant URL pa= rser > written in C++. > +Specification for URL parser can be found from the WHATWG website.") > +=C2=A0=C2=A0=C2=A0 (license license:gpl3+))) Cheers From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 18 05:59:54 2024 Received: (at 71897) by debbugs.gnu.org; 18 Sep 2024 09:59:54 +0000 Received: from localhost ([127.0.0.1]:57059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqrTW-0000h4-Bh for submit@debbugs.gnu.org; Wed, 18 Sep 2024 05:59:54 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:52449) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqrTU-0000gi-Fj for 71897@debbugs.gnu.org; Wed, 18 Sep 2024 05:59:53 -0400 Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-42cb57f8b41so70599225e9.0 for <71897@debbugs.gnu.org>; Wed, 18 Sep 2024 02:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726653510; x=1727258310; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=xPYmmNJAjwwDyWvOWBB+TDmk8moD/rY44kp3BlI4Gqw=; b=fLX3Y9gfr5yKHVkC6cdhMOcxj1UrEpSrpwUtU0Jsx5lREhp4beGemOeeYv6c/NmsBm TsErHsl4JjumizkqelcdDWaE9H1U3QgHg60y59PQkq1s5yqs9q+VItR0TELYqdVOqJuH ZhIAWbf7epjcT5xXaoF6TcxzTT9h0n/s9pr7/fHJ33Pl8Hwx2a1LZmoeLFFV4Pop3Kdc A4gZkva8l989sg4zFJjOLBEMT90MMmA4j3i2z0qJ69e2cK0vAsPJtPqG3MkiS56JQSLp +smkNlsr6bpRNvqGK4z/vlBXaoHxOpxntYIg4uXXvEwepZ0Ck+XBo6OUCVq2BuZBdMl3 QBJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726653510; x=1727258310; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=xPYmmNJAjwwDyWvOWBB+TDmk8moD/rY44kp3BlI4Gqw=; b=KsUVXLw2HwD85zNcrcyx7CiNMkYnLMe9iqIrP3wXUiwdRXNjhnZ5RRLBNWYikWSQwS aNnZwyyOsHi1QB2vxY1iLp5hzyjjh2QNJCLBQ5uII6iAcNEtGFcjRWSepxu8KRPAdEfV aZDuEtrZnTsc+2+S8ImLTOKrY/0npJs0JXZtPoB2Z2fjQyzUrJxNeDPwUzC987aACYw4 wZMSwiRzCRcBTITaXigAiTA03bg1Sa8LZnO7sj9UeiwmhKGXpbLIqCiq2UtppF5CWZQx 9kYZj0GScF1FGaRdbsvOiJHam0U2jfcTef0AMuRPWCMVcPf13HstROjp6FVW5j6EmdkK 5zRQ== X-Gm-Message-State: AOJu0YwDUBe2OUIjUGY3T4mBo51No/ZUm2z7zW7Nwexg4zs1nHym97OU 9Q3482+oIW9tPZCmWG+ftrDLcYSYiZ/1fnlEN/1BbslkFWcyK5I5 X-Google-Smtp-Source: AGHT+IFmlijmf2z78x8zN6wYeiL19EzPSiAt39/d6eFd3jkDKr3iiApgMRA0es/6volhOQafQAGZ5w== X-Received: by 2002:a05:600c:1c9d:b0:42c:af5f:c00c with SMTP id 5b1f17b1804b1-42d908315a6mr173340945e9.21.1726653509967; Wed, 18 Sep 2024 02:58:29 -0700 (PDT) Received: from guxtil (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e7052536csm12466595e9.42.2024.09.18.02.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2024 02:58:29 -0700 (PDT) From: Sharlatan Hellseher To: 71897@debbugs.gnu.org Subject: [PATCH 0/3] gnu: telegram-desktop: Update to 5.2.1. Date: Wed, 18 Sep 2024 10:58:27 +0100 Message-ID: <8734lxb7wc.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: dan , Liliana Marie Prikler , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Hi, Telegram is segfaulting on: --8<---------------cut here---------------start------------->8--- guix describe Generation 43 Sep 13 2024 21:14:29 (current) guix 0e0d9bc repository URL: https://git.savannah.gnu.org/git/guix.git branch: master commit: 0e0d9bc91f20ac6dda439ab09330f0163eb9bf42 --8<---------------cut here---------------end--------------->8--- --8<---------------cut here---------------start------------->8--- Telegram-WARNING **: 10:55:34.082: Application has been built with foreign rlottie, animated emojis won't be colored to the selected pack. Segmentation fault --8<---------------cut here---------------end--------------->8--- Is anything left to be updated on this patch series? -- Oleg --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmbqpEMACgkQdtcnv/Ys 0rXBcQ/+OaBXCtcpu9YD/MMG1dmjR3TYggN/hQhx0bEgEHKjLPDluXmjVO09/n+O 7JTyCzd/NofNyEx5YaxLoZdV09GCnfGoDNciVS71pJJqnS24NJVw9jkbmwpZn3mY qDehxgpLOqehdUlG8b2DxB6sXQnB6NcQ6dCJTEspMfB6A9xN89U9jMdq/VjHOXuN +pWuwqIOEtHdlvN1sNZZJSa2joc73JsZM7WS5J2DHVuxSA16kyANTdRUbfxK9pGR BFOzjDuYe3uMjADZnVYoYMXXkoiOg5c/aDN4eAfS6p2uKWWieLn2YvWkQ3j4i8xj o64j4z0R0gHA6QjXgJ/Sojxbz9lJecz9e7xCjeTJpYJ5tv7DWgla1HmhQf48iUgl 61EoIGAEl0QCJNNhx2igO6/VW+J6fKlIZ+XCdWuToP1pcPJwBHwKb17w+v7eh3kK 1eNYyvbX7531urxrHbR+Mz+HKCEHtx2kxLKYR/axVpx5LUcmuRSZ5DO2rXePxqSk 0C4Yn/Kvx7veJhAZplSUTY9+KjT7H8DplNjEDWdbkQsIx604otErmpMycDTDhYRw kQaIT2x2W5c7WqRoK7qy5yUYqPswyQPzVcLfoYP1fh81XGYZowZznQo9Nf6yvff+ 6+gQ4w/cAZ4+pltv6zQdL51je7uiCHlZv2GKSxn/6TnKBsLm0Ak= =zNEC -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 06:35:55 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 10:35:55 +0000 Received: from localhost ([127.0.0.1]:37396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srxT1-0006ZN-3h for submit@debbugs.gnu.org; Sat, 21 Sep 2024 06:35:55 -0400 Received: from fhigh3-smtp.messagingengine.com ([103.168.172.154]:40367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srxSy-0006Z1-E0 for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 06:35:53 -0400 Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfhigh.phl.internal (Postfix) with ESMTP id 149B4114022A; Sat, 21 Sep 2024 06:35:26 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Sat, 21 Sep 2024 06:35:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1726914926; x=1727001326; bh=cSkxpLxRkq lkusl1Tl533xdSTzdyYxONtDu64NyW/74=; b=qBZIF5me5P+20xuPFfcxetTSNw VVtdq7KlnlfzYT6XYQH4OfDOOxU9z2CR73trdhC/sbSLa+eEU4AP5eiShN8qSmMb gXcy03j598HhVtkjPXjfrLsK7IekaWAzmDXWiFjzpUgwuPltqvvnCgrD+6F1oPp3 VeVJsgVk1JuEwRzSpQysLf1Vq/Kvx3XXLivoCm2LIQov4WxlRVpKRKmnbme2ZCnJ HcoG1yBmBghjdl0QLx+GlOMoudgD2Rzj9V5YydRzIUCPaqp6/Bg8c7auYOnFry2l V4O2v6e0NcOkqeK2ThjzocSQAD40JtkAdMr6nQNRTRYWfm0g0nJs4a/o55pw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1726914926; x=1727001326; bh=cSkxpLxRkqlkusl1Tl533xdSTzdy YxONtDu64NyW/74=; b=R5P/wRZTJVA5uEkcMQz0URRWT6MRBThy3TaMQYRIkiJr v86AAlvEcVr633Twy79KhmmtN0FmyhEAVr8kHlvWPxFzi8O49DfGElPCLUlY8Cfl TGDEbABiki6QeY9veuwuO5a3MTLVmXI/TpfRj5zehzGpMzV0inRY3g5ao0YLMxA6 AB4JNv1m5ZQe912AqhoQyVx05DJO11RT14ZrzReAfxkmOfrSca1T3uQQH+eeq0XV obsTf699Tjkgqsb26lPISwYYme9dHzmbwNGQRhWiWnR219Ms+ondyJURYuDX5Cug EVvDYrO2XjkY2KrPbiFa/fBeRJBNS/49ek+XVMECdw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgfeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefujghffffkgggtsehttdertddttddtnecu hfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghrnhepte eiffdvleekhedttdevffelfffghfehleehtdehveetgeekjeeggedvgfeutdetnecuffho mhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepihesuggrnhdrghgrmhgvshdpnhgspghrtghpthhtohepgedpmhho uggvpehsmhhtphhouhhtpdhrtghpthhtohepshhhrghrlhgrthgrnhhushesghhmrghilh drtghomhdprhgtphhtthhopeejudekleejseguvggssghughhsrdhgnhhurdhorhhgpdhr tghpthhtohepmhgrgihimhdrtghouhhrnhhohigvrhesghhmrghilhdrtghomhdprhgtph htthhopehlihhlihgrnhgrrdhprhhikhhlvghrsehgmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 21 Sep 2024 06:35:25 -0400 (EDT) From: dan To: Sharlatan Hellseher Subject: Re: [PATCH 0/3] gnu: telegram-desktop: Update to 5.2.1. In-Reply-To: <8734lxb7wc.fsf@gmail.com> (Sharlatan Hellseher's message of "Wed, 18 Sep 2024 10:58:27 +0100") References: <8734lxb7wc.fsf@gmail.com> Date: Sat, 21 Sep 2024 18:35:21 +0800 Message-ID: <87plox70ra.fsf@dan.games> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 Cc: Liliana Marie Prikler , Maxim Cournoyer , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Sharlatan Hellseher writes: > Hi, > > Telegram is segfaulting on: > > --8<---------------cut > here---------------start------------->8--- > guix describe > Generation 43 Sep 13 2024 21:14:29 (current) > guix 0e0d9bc > repository URL: https://git.savannah.gnu.org/git/guix.git > branch: master > commit: 0e0d9bc91f20ac6dda439ab09330f0163eb9bf42 > --8<---------------cut > here---------------end--------------->8--- > > --8<---------------cut > here---------------start------------->8--- > Telegram-WARNING **: 10:55:34.082: Application has been built > with > foreign rlottie, animated emojis won't be colored to the > selected pack. > > Segmentation fault > --8<---------------cut > here---------------end--------------->8--- > > Is anything left to be updated on this patch series? I've rebased this patch series to master, updated it to latest (5.5.5) and build it. When trying to run telegram-desktop, it also crashed with SIGSEGV. Using gdb, I obtained the stack trace: --8<---------------cut here---------------start------------->8--- #0 0x00007ffff7fdb65d in _dl_update_slotinfo () from /gnu/store/zvlp3n8iwa1svxmwv4q22pv1pb1c9pjq-glibc-2.39/lib/ld-linux-x86-64.so.2 #1 0x00007ffff7fdb73c in update_get_addr () from /gnu/store/zvlp3n8iwa1svxmwv4q22pv1pb1c9pjq-glibc-2.39/lib/ld-linux-x86-64.so.2 #2 0x00007ffff7fde298 in __tls_get_addr () from /gnu/store/zvlp3n8iwa1svxmwv4q22pv1pb1c9pjq-glibc-2.39/lib/ld-linux-x86-64.so.2 #3 0x00007ffff162092b in free () from /gnu/store/j1dpz07vh9wagksidqjqbckh7ihn6hl6-jemalloc-5.3.0/lib/libjemalloc.so.2 #4 0x00007ffff7fdb677 in _dl_update_slotinfo () from /gnu/store/zvlp3n8iwa1svxmwv4q22pv1pb1c9pjq-glibc-2.39/lib/ld-linux-x86-64.so.2 #5 0x00007ffff7fdb73c in update_get_addr () from /gnu/store/zvlp3n8iwa1svxmwv4q22pv1pb1c9pjq-glibc-2.39/lib/ld-linux-x86-64.so.2 #6 0x00007ffff7fde298 in __tls_get_addr () from /gnu/store/zvlp3n8iwa1svxmwv4q22pv1pb1c9pjq-glibc-2.39/lib/ld-linux-x86-64.so.2 #7 0x00007ffff162092b in free () from /gnu/store/j1dpz07vh9wagksidqjqbckh7ihn6hl6-jemalloc-5.3.0/lib/libjemalloc.so.2 #8 0x00007ffff7fdb677 in _dl_update_slotinfo () from /gnu/store/zvlp3n8iwa1svxmwv4q22pv1pb1c9pjq-glibc-2.39/lib/ld-linux-x86-64.so.2 #9 0x00007ffff7fdb73c in update_get_addr () from /gnu/store/zvlp3n8iwa1svxmwv4q22pv1pb1c9pjq-glibc-2.39/lib/ld-linux-x86-64.so.2 #10 0x00007ffff7fde298 in __tls_get_addr () from /gnu/store/zvlp3n8iwa1svxmwv4q22pv1pb1c9pjq-glibc-2.39/lib/ld-linux-x86-64.so.2 #11 0x00007ffff162092b in free () from /gnu/store/j1dpz07vh9wagksidqjqbckh7ihn6hl6-jemalloc-5.3.0/lib/libjemalloc.so.2 #12 0x00007ffff7fdb677 in _dl_update_slotinfo () from /gnu/store/zvlp3n8iwa1svxmwv4q22pv1pb1c9pjq-glibc-2.39/lib/ld-linux-x86-64.so.2 --8<---------------cut here---------------end--------------->8--- I'm not sure what's the real cause of this SIGSEGV, but seems like glibc is calling free from jemalloc, which doesn't seem correct. To test, I removed jemalloc from inputs and added the disable jemalloc flags. This time telegram-desktop could run without any problem. I suspect this is related to the glibc, since it's updated recently, but I haven't done any bisect test, since building telegram-desktop is really time-consuming. Would like to know if it's appropriate for me to disable jemalloc for telegram-desktop. -- dan From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 07:35:35 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:35 +0000 Received: from localhost ([127.0.0.1]:37453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOl-0001NJ-45 for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:35 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:44153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOg-0001H4-T3 for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:33 -0400 Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfout.phl.internal (Postfix) with ESMTP id 0170C13802F9 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:05 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Sat, 21 Sep 2024 07:35:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm3; t=1726918504; x=1727004904; bh=xTzh81FaoB O9c0BbcLDB9XUp5b92F6krH4HzZWa0vZw=; b=acQUqWIKH8YAjIKgWYuP9kn9nr ixeyao/W4fNBHX2800R9QESyRnFPK76RzzDkaJxz7ho7Q3SpH1J2i4sdxr+NQqjt cCyRlRknnQ7iBh/WMKpjtLq9IjBviJG8jte0+A3M2Id/QJFEebY59vViDybteYVQ YVBg/csOFo4I66fbXZnKI0n4M/g/5zd4YgzdG7/+jMCAYJPEqyPrKJ765jt/81y/ +on/KjebFuE7f+s5kGil47De5dGppikQc0ZZvWkV5X5/MWb4NGXZ/L9Gue0QFT/K 608sUJ31vmGUzclLa7FwfoxwegBNeRfAsKO20J4mfw1+2eQpW6z0D1I6Rjgw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1726918504; x=1727004904; bh=xTzh81FaoBO9c0BbcLDB9XUp5b92 F6krH4HzZWa0vZw=; b=jLu/TqoZhKXISyAWKxu7Ep0dAJPPlca12+lzyIc07Hpn KTIrhWrOwFbbR9q8ygOdz0piBgaz9X/5FQlJorLjTe1rzJ0Udny/z4WCJh7NU7Hl MvOgXUcUlWK+gwq4TGKbQ2/EjkfWe/ewhrKrTwRbOqL0nw6XHOozNk/NsFgL+vpK Gc6gt8IBO5jZgZxdZ6wrVMBxqtWNiUGHDqeG1KgW2YV5spzYzaJFrUl2u1q0leNq 1fojpUdoPWAMZjAmlON42ioeb6LwSQaJphPokO72P7MfY4RLVp3mVPAZNNTRdJjw K4QDNfxI22A9m70Mjr4urhx7DIhaddMcag6rKHDTlw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofggtgfgsehtkeertdertdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgv sheqnecuggftrfgrthhtvghrnhepgeejhefggffggfeiheekvdekveetgfejteefuddtfe evtdetuddtfeehhefhtdehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhepihesuggrnhdrghgrmhgvshdpnhgspghrtghpthhtohepuddpmhhoug gvpehsmhhtphhouhhtpdhrtghpthhtohepjedukeeljeesuggvsggsuhhgshdrghhnuhdr ohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:03 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v7 1/9] gnu: xdg-desktop-portal: Update to 1.18.4. Date: Sat, 21 Sep 2024 19:34:35 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.18.4. [patches]: Disable portal tests. [native-inputs]: Remove autoconf, automake, libtool and which. Add python, python-dbusmock, python-pytest and python-pytest-xdist. [inputs]: Add bubblewrap. [phases]<#:configure-flags>: Update flags to meson options. Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 25 +++++---- ...-desktop-portal-disable-portal-tests.patch | 56 +++++++++++++++++++ 3 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8e7abc8a47..802f4be4fe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2303,6 +2303,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-dbus-group-policy.patch \ %D%/packages/patches/x265-arm-flags.patch \ + %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xen-docs-use-predictable-ordering.patch \ %D%/packages/patches/xen-remove-config.gz-timestamp.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 993bb84ec6..46199bac00 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2024 aurtzy ;;; Copyright © 2024 Dariqq ;;; Copyright © 2024 Wilko Meyer +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -136,6 +137,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages video) + #:use-module (gnu packages virtualization) #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -2986,7 +2988,7 @@ (define-public libportal (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.16.0") + (version "1.18.4") (source (origin (method url-fetch) @@ -2995,18 +2997,21 @@ (define-public xdg-desktop-portal version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav")))) - (build-system gnu-build-system) + "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q")) + ;; disable portal tests since they try to use fuse + (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("glib:bin" ,glib "bin") - ("which" ,which) - ("gettext" ,gettext-minimal))) + ("gettext" ,gettext-minimal) + ("python" ,python) + ("python-dbusmock" ,python-dbusmock) + ("python-pytest" ,python-pytest) + ("python-pytest-xdist" ,python-pytest-xdist))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) + `(("bubblewrap" ,bubblewrap) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("flatpak" ,flatpak) ("fontconfig" ,fontconfig) @@ -3018,7 +3023,7 @@ (define-public xdg-desktop-portal ("fuse" ,fuse))) (arguments `(#:configure-flags - (list "--with-systemd=no") + (list "-Dsystemd=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'po-chmod diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch new file mode 100644 index 0000000000..5e13493613 --- /dev/null +++ b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch @@ -0,0 +1,56 @@ +From b7750fa99c31c5f28ac2053fa154bef4038b5cc0 Mon Sep 17 00:00:00 2001 +From: dan +Date: Tue, 2 Jul 2024 19:37:38 +0800 +Subject: [PATCH] tests: remove portal tests. + +--- + tests/meson.build | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index a2dafee..bcd87be 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -181,18 +181,6 @@ portal_tests = [ + + test_env = env_tests + test_env.set('XDG_CURRENT_DESKTOP', 'test') +-foreach p : portal_tests +- test( +- 'test-portals-@0@'.format(p), +- test_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/portal/@0@'.format(p)], +- depends: [test_backends, test_portals], +- env: test_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + # Split the portal tests into one test per portal, this makes debugging a lot + # easier. +@@ -204,18 +192,6 @@ portal_limited = [ + + limited_env = env_tests + limited_env.set('XDG_CURRENT_DESKTOP', 'limited') +-foreach p : portal_limited +- test( +- 'limited-portals-@0@'.format(p), +- limited_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/limited/@0@'.format(p)], +- depends: [test_backends, limited_portals], +- env: limited_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + if enable_installed_tests + install_data( + +base-commit: 11c8a96b147aeae70e3f770313f93b367d53fedd +-- +2.41.0 + base-commit: 9d75215a59629ab224154ef6b843043289291f81 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 07:35:36 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:36 +0000 Received: from localhost ([127.0.0.1]:37455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOl-0001NL-P3 for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:36 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:49699) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOj-0001JU-8Q for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:33 -0400 Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfout.phl.internal (Postfix) with ESMTP id F3C8213802F2 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:07 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Sat, 21 Sep 2024 07:35:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726918507; x= 1727004907; bh=+2XxSOfMb65RvTqwwdqRBQCQZEvbzK6GZkgv4Tsd37c=; b=N /r8IGcybLmkh0Yy374xjvRdOjxP8PmDVYL3exOCIoRCcFOLfewyZh/tLfgPtZNCO RUJ0UCzJBuJJUYWIc5PQxfjv579ggGc5WjQhZvcDgKqegtinYr6rfGfjnBKfrAHW JiWYDhm7NlpBgYWEess9PRQSfZj45OfbMFnrL2qjOTa9Ww2fAg6gpDu23Xg3d9vt htqbiM4vStQMO+A+D7BTawYpSQRIUjgODRBWEXGwRch0Iis5ZC6layWK+s5MozUP ayNN/WqJ5bzeowhkpmkMjo/GxiTwbuR6AeGWr25tIsZpPf/yOFQw1fy5pdT4vvAj rcmNW9GoSwmrBErbqmRfg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726918507; x=1727004907; bh=+2XxSOfMb65Rv TqwwdqRBQCQZEvbzK6GZkgv4Tsd37c=; b=DDt5zoacDWrSeDrCPC5ufSbUjYErI 43HgmrRhI5JI9+2XOmeR3EkwpDj/0txfLCSA7EAeKAIRubXBdFPt/Mui7vOvJMOL dgy2G2HF0yCs+VyIS0Y9kp3EBdCYQGOWWqUTZKiWyEoubplSwOZ5Zalx7gdFimLb KauWBcSzw83M42SuoucW1pVzNs7ioWJ1RKrDlAQKt6X1CAyVlocA3Mx8LXkutGif kie2/p/muvAe/PZ6dVZVY7A/xtvorE4r8r91TYOlPtE3hZm165hkfG+DZkA0xvym lCrfnzcNRJ8UmzUhBx97d+mwRm1mvBVKYshep+qKMQLezo04JpwBsvbXQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpeeffffftdehteetvdelieehgeehtedvteethefgte eivdetgeegtdejtdduudeludenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhep mhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgtphhtthhopedupdhmoh guvgepshhmthhpohhuthdprhgtphhtthhopeejudekleejseguvggssghughhsrdhgnhhu rdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:06 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v7 2/9] gnu: xdg-desktop-portal: Update input style. Date: Sat, 21 Sep 2024 19:34:36 +0800 Message-ID: <40209aa7c18e3d39cb2935e6573875204e7724a7.1726918430.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update input style. Change-Id: Iec0630cd945dfcd4db67af30211cbfd4d058766d --- gnu/packages/freedesktop.scm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 46199bac00..e02b3d89dc 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3002,25 +3002,25 @@ (define-public xdg-desktop-portal (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) (build-system meson-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("glib:bin" ,glib "bin") - ("gettext" ,gettext-minimal) - ("python" ,python) - ("python-dbusmock" ,python-dbusmock) - ("python-pytest" ,python-pytest) - ("python-pytest-xdist" ,python-pytest-xdist))) + (list gettext-minimal + (list glib "bin") + pkg-config + python + python-dbusmock + python-pytest + python-pytest-xdist)) (inputs - `(("bubblewrap" ,bubblewrap) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) - ("flatpak" ,flatpak) - ("fontconfig" ,fontconfig) - ("json-glib" ,json-glib) - ("libportal" ,libportal) - ("dbus" ,dbus) - ("geoclue" ,geoclue) - ("pipewire" ,pipewire) - ("fuse" ,fuse))) + (list bubblewrap + dbus + flatpak + fontconfig + fuse + gdk-pixbuf + geoclue + glib + json-glib + libportal + pipewire)) (arguments `(#:configure-flags (list "-Dsystemd=disabled") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 07:35:43 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:43 +0000 Received: from localhost ([127.0.0.1]:37461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOs-0001Np-5J for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:43 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:50803) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOm-0001Mz-55 for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:39 -0400 Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id DCCAF13802F8 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:10 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Sat, 21 Sep 2024 07:35:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1726918510; x=1727004910; bh=E3vBdmd4NNiyPGZwq+rt33Ii907fOXVEULqddZJmwhE=; b= e/cLqomJjd8uwYGd+FwtbRORWepZmPq4gytTcN7t/yU4sV85d+12Aci14nPi8KOJ rViDd6qTw8O8+jSXB3UbRINl7Fc6DXhhvF4vqbLwl6MRJUeCn86kYriPuo7axdh3 5vtXP1YBJdEyXBMCaEUlOV32qK9IY4lVqGjPXqqWkjrGm1ZjqSqOH22j2aWsmE7o KgeV/3+lt/p/V9vEYk6z+WMCioCsT4MlEr83sGXY1jp54R9IYqW9zqNPY8vprAjp A9dqEiw27vCRIWT/XCQfctlVfnDyXklXiodimVdDyxpkyE4n+bvZGVgH7R58n+Da RaIhSoWmudKNzaXrHA94sA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1726918510; x= 1727004910; bh=E3vBdmd4NNiyPGZwq+rt33Ii907fOXVEULqddZJmwhE=; b=K IU8TH96rPy80ZSejkr8cPLKpDmhu8PQKjA24bx7yBZIOLnuNvykECyUVj/8e+9Nc SMoaNFfK6egFzwpv6Y3djWpI21gj0jeaZ5r8PU75QXlldVBTmPfygobwmVlGDlB2 ZxYJOsDDpcuhaJ83zvJu8Yu4GAQByJ00CIecLxyBYYpPrGku8Pp08nTew+deVUqg 9TSJbtoV/G/N60CpxWCDvNNelOgutfe0kfxnNUDnBwmm2DrfOanhy8pHO852cGRQ mGryJWo217mJjb64SMYZ6gfomWipLeWR6Di+R0ulRyI/3PkmBYHnYTyqgwOy+Qcj 83oj4oJrC5tpw7/cY9g8A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgr mhgvsheqnecuggftrfgrthhtvghrnhepgfettddtgfdttdeiffdufeefleegtddutddvve ehkedtieefvdeifeeiffeijeeunecuffhomhgrihhnpehgihhtlhgrsgdrtghomhenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrd hgrghmvghspdhnsggprhgtphhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphht thhopeejudekleejseguvggssghughhsrdhgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:09 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v7 3/9] gnu: Add cppgir. Date: Sat, 21 Sep 2024 19:34:37 +0800 Message-ID: <3b31fc145f1afc287f95c57249a3dd16d87ac779.1726918430.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher , Vivien Kraus Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/glib.scm (cppgir): New variable. Change-Id: Ic4510be6d05b7b3977aa457c6a7fec382c1d3a88 --- gnu/packages/glib.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d6275ea63e..f695d065b3 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2021, 2024 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver @@ -21,6 +21,7 @@ ;;; Copyright © 2023 Saku Laesvuori ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Remco van 't Veer +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -72,6 +73,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) @@ -1592,3 +1594,30 @@ (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 "2.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cj4myqzb28hgb7zlxlba9y8n4ysxkvv2y9wy6f7ps58mr18h7bl")))) + (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 "GObject introspection C++ binding wrapper generator") + (description "cppgir processes .gir files derived from GObject +introspection annotations into a set of C++ files defining suitable +namespaces, classes and other types that together form a C++ binding.") + (license license:expat))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 07:35:43 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:44 +0000 Received: from localhost ([127.0.0.1]:37465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOt-0001Ny-8A for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:43 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:48887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOp-0001NH-3M for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:39 -0400 Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfout.phl.internal (Postfix) with ESMTP id CF06E13802F2 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:13 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Sat, 21 Sep 2024 07:35:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726918513; x= 1727004913; bh=Kc56k18rt3CVc0itDOUXwAK203nw+RFffLnTMKJZEgQ=; b=E C0USvH25/4eQxmdA7WvRtS9qYqTbgixBWJEJIQDr0Yx5lVWVmuSSruJHnhqm2+RX HOu0P5bWVIDvya6gLhQUDC5g/ct0L+Y20ZxQXCTDevho+gotOwNYlfSLAISd+47v ScTbFeluaYEzaZeTjcYEPfbJDEDJrYgTdgfEhz/WlyaKMJM+yQ1XWpzVFDHiOr3Z il8QYWmuKJSKPEItxzwplfhFmxkh0ALxiK7RD4AEeXoeyRH4GRH2aqClpCpjD7nc FZisprvIC2VIG5VcaFAv9g7URS8fWGbylfGPss0OS2rUju3Ld3skhFeY60V948rc XNamjifjtqx91Dmj7aBLA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726918513; x=1727004913; bh=Kc56k18rt3CVc 0itDOUXwAK203nw+RFffLnTMKJZEgQ=; b=UIAG6unconF5LLIozPa5iz5KF/b3N 6cdnYbUwFNS3mEp1Wz7iSdnQRVMT6j9IrTaejIXXZ9xf9awDCd2MNyOHeNMyLawL 3F1IOyUEcwwd5G0oA/Lan9iNEU0DRlTuCaJUzWTElV9ci9RVC1bZxSoKZp1ZXw8m 8Jv9JhCmtawDZTBWxwqBNHJZMH1pzBJHYWSfR5/tU0q1W2v2SMoNI0dGnbIcjZYR nVN6MUesB+9vfGKdv0ZyCAH5tGuSm+90TZD0bo9DXZsMlSsgSLlXYJC8arhktwJG 8wK4O9utYKqhHE8PPfVRu2+pM+1YKVP1cRzsCRSN/yazRJrqOBjbMKKLw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpeellefgffefiefgleetudeliefgjedvteeugffghe fggfeivefhvdevfeeftdeljeenucffohhmrghinhepghhithhlrggsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:12 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v7 4/9] gnu: Add cppgir-for-telegram-desktop. Date: Sat, 21 Sep 2024 19:34:38 +0800 Message-ID: <5ea5fdcad7469cd5b47ebf4d99d9b2948a3fec0c.1726918430.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher , Vivien Kraus Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/glib.scm (cppgir-for-telegram-desktop): New variable. Change-Id: Ib9ca3bd376f32d13939adabd2c52e1eb24e2ddcb --- gnu/packages/glib.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f695d065b3..75954217be 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1621,3 +1621,22 @@ (define-public cppgir introspection annotations into a set of C++ files defining suitable namespaces, classes and other types that together form a C++ binding.") (license license:expat))) + +;; telegram-desktop requires a more recent version of cppgir +(define-public cppgir-for-telegram-desktop + (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") + (revision "0")) + (package + (inherit cppgir) + (name "cppgir-for-telegram-desktop") + (version (git-version "2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fa9nf4yljfarihaqj5kd98yysrky7q316mh6l5b1rq39ga15k9b"))))))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 07:35:48 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:48 +0000 Received: from localhost ([127.0.0.1]:37469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOx-0001OP-Ue for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:48 -0400 Received: from fhigh4-smtp.messagingengine.com ([103.168.172.155]:39863) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOs-0001NZ-B5 for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:42 -0400 Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfhigh.phl.internal (Postfix) with ESMTP id EFEF21140233 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:16 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Sat, 21 Sep 2024 07:35:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726918516; x= 1727004916; bh=4VZSxwnGY/koEx83zW/rTcyIAmjQbDiHKNmiT3D9gCw=; b=h wQ9kz7T+Z9ALyiv6Na6L2DueUD87zRInpB0vCEXO7GyUaLzIefHfbuYM7mWksNun UY/WsVgO/39kXMq4i0lqPaxLA3i53t/LvyG6GWAe5LQhOjB8E12rClkOX8cJB5pT YaztGUmP+LejTm76C7krtbveYmpdUud7MhSLtzaU8N4slY+eCxpH7Bq0V64vfC7g u3Fe0xgXuSgk1EnMjCc3V/1tU8iMBzRj/GVbNa8QlXPm/DKyXFWbt/vH6J7No99o 4RuyEzS0NmQzjxBXgw8pZlQeazS4bfKqqfmdqaXF39CKDeXZ7fBYURbNFWZ07tFO lcD2G3EEvGCN+XECSSsjg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726918516; x=1727004916; bh=4VZSxwnGY/koE x83zW/rTcyIAmjQbDiHKNmiT3D9gCw=; b=mIH0inBrXQLuicfhSnNzHZlteVf5/ 5cWBOhgK/nmcAubOCuwVZPP/raQjpKCFvyHDB/+/e4dag6acYDFl4IPq77WaZ9PZ U4fhWbJKqRDSaWAECTHCNuq3WQ/PTOnV+utMAC/aOCdUqrJ2kbARSBxPleGny9ex JoGe+zojmR+o7nIgtzutZ6wxbd0ubJGYaXREWUipiOjz82XJ0g/kYADLdad+EUpT guyyAdgYlsdtvwl5OEn4KUtfYwHHTwGinJ852Iqchr+4YtpIZ7bDU3+THLarAp8p Yhq274ipofKGsScW3ql9U2w6fwXONMN4ou12E5o7kA6Rq38g86roPgmYA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpeeffffftdehteetvdelieehgeehtedvteethefgte eivdetgeegtdejtdduudeludenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhep mhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgtphhtthhopedupdhmoh guvgepshhmthhpohhuthdprhgtphhtthhopeejudekleejseguvggssghughhsrdhgnhhu rdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:15 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v7 5/9] gnu: simdjson: Update to 3.10.1. Date: Sat, 21 Sep 2024 19:34:39 +0800 Message-ID: <16a437abfa07b281d01143c7785366abda3a330c.1726918430.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/cpp.scm (simdjson): Update to 3.10.1. Change-Id: I6711077e162bcfbf6702d521fdeec44e3b21f074 --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7d782c7ea6..c805dae825 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2395,7 +2395,7 @@ (define-public python-jsonnet (define-public simdjson (package (name "simdjson") - (version "3.1.0") + (version "3.10.1") (source (origin (method git-fetch) (uri (git-reference @@ -2404,7 +2404,7 @@ (define-public simdjson (file-name (git-file-name name version)) (sha256 (base32 - "0q784bm8xbz3p782dw02cdds6m71wk3acy94vva8krc9g88142ws")))) + "1qv7lvls7x9aw6mlnwfgchbajsxh6qygp09wpkb2w6mjdbidmi0h")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; tests require downloading dependencies -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 07:35:48 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:49 +0000 Received: from localhost ([127.0.0.1]:37471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOy-0001OR-8g for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:48 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:43147) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOv-0001Nm-AE for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:45 -0400 Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfout.phl.internal (Postfix) with ESMTP id 05DEC13802F2 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:20 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Sat, 21 Sep 2024 07:35:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726918520; x= 1727004920; bh=kNnslu7Qd760CTNfzyRGZm1su8+Xxu8QOGBCj1aNzIY=; b=l gqZUWf3pmS8dYVcbv7ohZTXC0x91V2eY8pvGPBuxw4kiZpGfReYSxK/ykyZZuJ62 ArRXSF6clgFGjqZh8Py2ri6xIePbj6FdqzhxzSpt9MhjmxfwWIiU5rjzCqYySymS b5wSBCG3vaRTzKXOllb4HMbqMx9KbH/karZCZRHAufvSHVUc3TxFwDaAllXYW0QT b9vvS/ulj/eMNbM/Vig9IToTqdIM3B7UmL+vBgDToqEKbJ1TTo9OXatAAz0/oXHo WrlMENKo7Rjh4/J1/ycdloe6WHa/G/nhVSKA7Diu0SRTiMKXXEtYJmiWP0DOBwBg FMLf6sHklQEsG4zQGbzCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726918520; x=1727004920; bh=kNnslu7Qd760C TNfzyRGZm1su8+Xxu8QOGBCj1aNzIY=; b=AYuf1oz2Dr+LvXB00bQ7qAq0nFZb8 irRw6B7fJVc3f9/lga6ZeR+PrT+caFkVO7+39Bt5YGWwmfWdGwttkVA635aoxvy3 Z8TyQyiEiHq6iQc1IEiSHaAiHe3VClL8NExQHN8sn2b/DU057QZ25XZpYmFhoVLu 2JMgyic1R1vbA3DfP/suPyHkhcGNHHqSSPUOb4G5/pYxrFKzWD3/4ij516knN50R Flhk/kyKHiBxiwVjf+2ao0R/krckwj2Hrmnvb7imhlydVrK5PxjVc90+A4777KBk fVxfGfThiaNYfRadKC9lC0de28vyTA7Nvu6QiKO/kVhwrhOoKGrk90NNg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpefhjedvfeekkefhheeiveeuueeftdejveejleeute eludelgedtueetfefhudeuvdenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:18 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v7 6/9] gnu: Add ada. Date: Sat, 21 Sep 2024 19:34:40 +0800 Message-ID: <51fada8dc43be4563c0cbef38b19f9dc4ca03429.1726918430.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/cpp.scm (ada): New variable. Change-Id: I9924bba53ed58bbf306bf073c9724cd7bd6f570a --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 26 ++++ ...ser-find-system-testing-dependencies.patch | 130 ++++++++++++++++++ 3 files changed, 157 insertions(+) create mode 100644 gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch diff --git a/gnu/local.mk b/gnu/local.mk index 802f4be4fe..829c5e166e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1103,6 +1103,7 @@ dist_patch_DATA = \ %D%/packages/patches/cool-retro-term-wctype.patch \ %D%/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch \ %D%/packages/patches/coreutils-gnulib-tests.patch \ + %D%/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch\ %D%/packages/patches/cppcheck-disable-char-signedness-test.patch \ %D%/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch\ %D%/packages/patches/cpulimit-with-glib-2.32.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index c805dae825..92be49967f 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -3284,3 +3284,29 @@ (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 cpp-ada-url-parser + (package + (name "cpp-ada-url-parser") + (version "2.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ada-url/ada.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 "0xvvjlia627ajl966gdxzy2b1j0jiimx7zx8ypmffwx0k6x72qam")) + (patches (search-patches "cpp-ada-url-parser-find-system-testing-dependencies.patch")))) + (build-system cmake-build-system) + (native-inputs + (list cxxopts + fmt + googletest + python + simdjson)) + (home-page "https://github.com/ada-url/ada") + (synopsis "URL parser") + (description "Ada is a fast and spec-compliant URL parser written in C++. +Specification for URL parser can be found from the WHATWG website.") + (license license:gpl3+))) diff --git a/gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch b/gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch new file mode 100644 index 0000000000..b32d162530 --- /dev/null +++ b/gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch @@ -0,0 +1,130 @@ +From 74cac57a3cebe0cfbbc44f46270d5e51986f4881 Mon Sep 17 00:00:00 2001 +From: dan +Date: Sat, 21 Sep 2024 18:49:10 +0800 +Subject: [PATCH] find system testing dependencies. + +--- + CMakeLists.txt | 50 +++++++++----------------------------- + singleheader/amalgamate.py | 2 +- + tools/cli/CMakeLists.txt | 8 ++---- + 3 files changed, 14 insertions(+), 46 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a7ce3796..0903cc31 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,43 +28,23 @@ option(ADA_TESTING "Build tests" ${BUILD_TESTING}) + # errors due to CPM, so this is here to support disabling all the testing + # and tooling for ada if one only wishes to use the ada library. + if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS) +- include(cmake/CPM.cmake) +- # CPM requires git as an implicit dependency +- find_package(Git QUIET) + # We use googletest in the tests +- if(Git_FOUND AND ADA_TESTING) +- CPMAddPackage( +- NAME GTest +- GITHUB_REPOSITORY google/googletest +- VERSION 1.14.0 +- OPTIONS "BUILD_GMOCK OFF" "INSTALL_GTEST OFF" +- ) ++ if(ADA_TESTING) ++ find_package(GTest) + endif() + # We use simdjson in both the benchmarks and tests +- if(Git_FOUND AND (ADA_TESTING OR ADA_BENCHMARKS)) +- CPMAddPackage("gh:simdjson/simdjson@3.9.1") ++ if(ADA_TESTING OR ADA_BENCHMARKS) ++ find_package(simdjson) + endif() + # We use Google Benchmark, but it does not build under several 32-bit systems. +- if(Git_FOUND AND ADA_BENCHMARKS AND (CMAKE_SIZEOF_VOID_P EQUAL 8)) +- CPMAddPackage( +- NAME benchmark +- GITHUB_REPOSITORY google/benchmark +- GIT_TAG f91b6b4 +- OPTIONS "BENCHMARK_ENABLE_TESTING OFF" +- "BENCHMARK_ENABLE_INSTALL OFF" +- "BENCHMARK_ENABLE_WERROR OFF" +- +- ) ++ if(ADA_BENCHMARKS AND (CMAKE_SIZEOF_VOID_P EQUAL 8)) ++ find_package(benchmark) + endif() + + if (ADA_TESTING AND NOT EMSCRIPTEN) +- if(Git_FOUND) +- set(CTEST_TEST_TIMEOUT 5) +- message(STATUS "The tests are enabled.") +- add_subdirectory(tests) +- else() +- message(STATUS "The tests are disabled because git was not found.") +- endif() ++ set(CTEST_TEST_TIMEOUT 5) ++ message(STATUS "The tests are enabled.") ++ add_subdirectory(tests) + else() + if(is_top_project) + message(STATUS "The tests are disabled.") +@@ -72,12 +52,8 @@ if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS) + endif(ADA_TESTING AND NOT EMSCRIPTEN) + + If(ADA_BENCHMARKS AND NOT EMSCRIPTEN) +- if(Git_FOUND) +- message(STATUS "Ada benchmarks enabled.") +- add_subdirectory(benchmarks) +- else() +- message(STATUS "The benchmarks are disabled because git was not found.") +- endif() ++ message(STATUS "Ada benchmarks enabled.") ++ add_subdirectory(benchmarks) + else(ADA_BENCHMARKS AND NOT EMSCRIPTEN) + if(is_top_project) + message(STATUS "Ada benchmarks disabled. Set ADA_BENCHMARKS=ON to enable them.") +@@ -107,11 +83,7 @@ if(NOT ADA_COVERAGE AND NOT EMSCRIPTEN) + endif() + + if(ADA_TOOLS) +- if(Git_FOUND) + add_subdirectory(tools) +- else() +- message(STATUS "The tools are disabled because git was not found.") +- endif() + endif() + + install( +diff --git a/singleheader/amalgamate.py b/singleheader/amalgamate.py +index 52b154b6..94e4e638 100755 +--- a/singleheader/amalgamate.py ++++ b/singleheader/amalgamate.py +@@ -138,7 +138,7 @@ if SCRIPTPATH != AMALGAMATE_OUTPUT_PATH: + + shutil.copy2(os.path.join(AMALGAMATE_INCLUDE_PATH, 'ada_c.h'), AMALGAMATE_OUTPUT_PATH) + +-zf = zipfile.ZipFile(os.path.join(AMALGAMATE_OUTPUT_PATH, 'singleheader.zip'), 'w', zipfile.ZIP_DEFLATED) ++zf = zipfile.ZipFile(os.path.join(AMALGAMATE_OUTPUT_PATH, 'singleheader.zip'), 'w', zipfile.ZIP_DEFLATED, strict_timestamps=False) + zf.write(os.path.join(AMALGAMATE_OUTPUT_PATH, 'ada.cpp'), 'ada.cpp') + zf.write(os.path.join(AMALGAMATE_OUTPUT_PATH, 'ada.h'), 'ada.h') + zf.write(os.path.join(AMALGAMATE_INCLUDE_PATH, 'ada_c.h'), 'ada_c.h') +diff --git a/tools/cli/CMakeLists.txt b/tools/cli/CMakeLists.txt +index 9f0da167..d0f7e0c9 100644 +--- a/tools/cli/CMakeLists.txt ++++ b/tools/cli/CMakeLists.txt +@@ -8,12 +8,8 @@ if(MSVC AND BUILD_SHARED_LIBS) + "$" # <--this is in-file + "$") # <--this is out-file path + endif() +-CPMAddPackage("gh:fmtlib/fmt#10.2.1") +-CPMAddPackage( +- GITHUB_REPOSITORY jarro2783/cxxopts +- VERSION 3.2.0 +- OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES" +-) ++find_package(fmt) ++find_package(cxxopts) + target_link_libraries(adaparse PRIVATE cxxopts::cxxopts fmt::fmt) + + if(MSVC OR MINGW) +-- +2.45.2 + -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 07:35:54 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:54 +0000 Received: from localhost ([127.0.0.1]:37477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryP4-0001Oq-00 for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:54 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:39861) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOy-0001O5-L2 for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:49 -0400 Received: from phl-compute-07.internal (phl-compute-07.phl.internal [10.202.2.47]) by mailfout.phl.internal (Postfix) with ESMTP id 6014C1380307 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:23 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-07.internal (MEProxy); Sat, 21 Sep 2024 07:35:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726918523; x= 1727004923; bh=CGfP3BtmV5YLyvohOIZZ0SMwXg32uckWwX0jKdo3zCs=; b=T oWxQchsrNDiB6BbwzVMWAMDvrhsae1yVVHhy/1K5J9tyU0de7oZOnL45XKYE56Ba tJrNLek4twuiHzo5lNmxoz/l+7yQmfUX9Jn9r71tpA9FqMlvkn+vXUpR7QaKBHY9 WPJrANyBVEGsVXBg551MlCZAKd6Eb8fxCStse3AmVFtyoet+u+Z15jGI5NvdY5fH n0HwpmuZjteqOuHK1nQfE+r9vMIAj3g1SPPAssMd8TsCJwBkTxKiQQJ+679T+U/u QAw7+mz36LEYEdGMye3hw2bJ8kXrPfa+4MhdkUb5O4n7yKoObMw1JYt/K0WQv9e6 AECjsxwp3qAKLh4q4zT0w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726918523; x=1727004923; bh=CGfP3BtmV5YLy vohOIZZ0SMwXg32uckWwX0jKdo3zCs=; b=TaDLSpmrTepcn/V45ILk28xHqN7GM 3YLHJUPKS/z34CWosTGm7ZYtFRjIYgSpPqmel6Srd1Z9bS7j0wndjClNOsy0q5hy 9s+Y3x8MR+JNauGTVXA5ivDy3tdwkHjYhtdyawU+OLB+YUWdnM8kbp83qjNYSqgD VLljSTkduyUfE0OPazjfE8SRQfP1qyrIiJrP2stX0e7ALS32isFS5aNHYKkSd+XM xBePOoNNgJFNfQAig2o42+W4koLC4kP3H7+ENpkRsYy0pbPMojLllu548ZO6gF+H XSQJaoHSjnt1xeXrUC0okReboSFzuIfw4XYhpAezk54hbmeU86AwgErcg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpefhjedvfeekkefhheeiveeuueeftdejveejleeute eludelgedtueetfefhudeuvdenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:21 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v7 7/9] gnu: Add libprisma-for-telegram-desktop. Date: Sat, 21 Sep 2024 19:34:41 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/telegram.scm (libprisma-for-telegram-desktop): New variable. Change-Id: I855b463993654a8cad491c7b56c9581b3083f5e4 --- gnu/packages/telegram.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 432d6f79a1..af16d4840b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -400,6 +400,18 @@ (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 "23b0d70f9709da9b38561d5706891a134d18df76"))) + (file-name + (git-file-name "libprisma-for-telegram-desktop" "5.3.2")) + (sha256 + (base32 + "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) + (define-public telegram-desktop (package (name "telegram-desktop") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 07:35:58 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:58 +0000 Received: from localhost ([127.0.0.1]:37481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryP7-0001PD-D5 for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:58 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:52689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryP1-0001ON-Vk for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:54 -0400 Received: from phl-compute-07.internal (phl-compute-07.phl.internal [10.202.2.47]) by mailfout.phl.internal (Postfix) with ESMTP id B0D9B13802F2 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:26 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-07.internal (MEProxy); Sat, 21 Sep 2024 07:35:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1726918526; x=1727004926; bh=1qelBTBzlVxN7W66/lwjJAMmy66ViUr36KYeCEysQXs=; b= PGlQvEEmeY0hPtj8wQWF5hVQTgcsC33VXkaqB/7/bPdolfuw6kX9N36Fczwk0pSk 4LJ5TRKR20Ld2yWkYDEuDF4mdmyb49uyVSC3WiUKchkwIYWVId8XIObZsHybTEVD sCMlB18/GfeUgViFWB2qVb8miQ94d4ajK0Sojm7vEWRTlJ4wKS3JkuwLrrliZluf 38U9aJndQ2rLMZ58uJQM/VTHynZJEwvpieAvkQeCBR4LxU2E/Izf9DADUW80ugDU qrd4ihWZITtWyUFshzvpW9zeuQPQA3LNtUFgoY8tH0esqyzrgrMMwOhuANB4ycZ2 yuzJS6umjRkkUDAnGIMwcQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1726918526; x= 1727004926; bh=1qelBTBzlVxN7W66/lwjJAMmy66ViUr36KYeCEysQXs=; b=R eE+au7C07ak/vACMAYv5Nf1yhPR8He+yxQPAQuqIPkxSIhfYXbNwqJimXcPGXiKp D29xsGyEUVfCX3UO8w5DDoOP2na9sO4pxWgZxL4NFzHrVoAboA4ENUdUsHU+1ji8 scDG3IRdtXjQsIfVOGYTYtn3Z5ZSHgpMuaug0IEz3PWkrWbbSFzFal9kysXztUNg hsQdLcqa83GL40FQBiBIGC2nF67ZcT2LMm2BIRp486kj/i4w5DCrQKSI5zaF2PPh q7TVtpS1ZtDGAcpKzgPJBFU9HQrH97GbjnIPFswiQXR+gI8Gk1mfbdJ+tPPemeTO Qq+/sP5vXo7UxS38EmAtQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucgfrhhlucfvnfffucdlud dvmdenucfjughrpefhvffufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpegu rghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghrnhepieekuedvtdevle egheduheelheetfffhhfffhfdvveegveekhefhffeiueeigeeinecuffhomhgrihhnpehg ihhthhhusgdrtghomhdpkhhithifrghrvgdrtghomhenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgt phhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejudekleejseguvg gssghughhsrdhgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:24 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v7 8/9] gnu: telegram-desktop: Update to 5.5.5. Date: Sat, 21 Sep 2024 19:34:42 +0800 Message-ID: <2320704096aebf544e4b992a631ea74674d30868.1726918430.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: Update patch file to match upstream changes. * gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch: Update patch file to match upstream changes. * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. * gnu/local.mk (dist_patch_DATA): register them. * gnu/packages/telegram.scm: (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)[origin]: Add patches to unbundle gsl and cppgir. (libprisma-for-telegram-desktop): Use %telegram-version. (telegram-desktop): Update to 5.5.5. [#:phases]: Add libprisma-for-telegram-desktop. : New phase. : New phase. : New phase. [native-inputs]: Add ada, gobject-introspection and xdg-desktop-portal. [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite. Change-Id: I78df3434a2cd04afc54107b7fecd5e5a8df85564 * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: Change-Id: I086ca5016477b5e7713985c4ade4e2828b98a6ca --- gnu/local.mk | 2 + ...gram-desktop-allow-disable-libtgvoip.patch | 6 +- .../telegram-desktop-unbundle-cppgir.patch | 95 ++++++++++++++++ .../telegram-desktop-unbundle-gsl.patch | 31 ++++++ ...or-telegram-desktop-unbundle-libsrtp.patch | 7 +- gnu/packages/telegram.scm | 105 ++++++++++++------ 6 files changed, 201 insertions(+), 45 deletions(-) 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 829c5e166e..623da8c3ff 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2197,6 +2197,8 @@ 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-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-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch index a603bc9d72..1354a1e9cd 100644 --- a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -47,10 +47,9 @@ diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/ca index 5fe9ac677..bebf48e70 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp -@@ -39,8 +39,10 @@ class InstanceImpl; +@@ -39,7 +39,9 @@ class InstanceImpl; class InstanceV2Impl; class InstanceV2ReferenceImpl; - class InstanceV2_4_0_0Impl; +#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP class InstanceImplLegacy; void SetLegacyGlobalServerConfig(const std::string &serverConfig); @@ -58,10 +57,9 @@ index 5fe9ac677..bebf48e70 100644 } // namespace tgcalls namespace Calls { -@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register(); +@@ -56,6 +58,8 @@ const auto Register = tgcalls::Register(); const auto RegisterV2 = tgcalls::Register(); const auto RegV2Ref = tgcalls::Register(); - const auto RegisterV240 = tgcalls::Register(); +#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP const auto RegisterLegacy = tgcalls::Register(); +#endif 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..a24dbe25bb --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch @@ -0,0 +1,95 @@ +From a5c42e07ae223d440ff11347e0cf1fd58fd383df Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 1/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/CMakeLists.txt | 4 +++- + external/glib/generate_cppgir.cmake | 7 ++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt +index 3c6fe4be..c862705f 100644 +--- a/external/glib/CMakeLists.txt ++++ b/external/glib/CMakeLists.txt +@@ -13,9 +13,11 @@ function(add_cppgir) # isolate scope + set(BUILD_EXAMPLES OFF) + add_subdirectory(cppgir EXCLUDE_FROM_ALL) + endfunction() +-add_cppgir() + + include(generate_cppgir.cmake) ++if (NOT CppGir_FOUND) ++ add_cppgir() ++endif() + generate_cppgir(external_glib Gio-2.0) + + find_package(PkgConfig REQUIRED) +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index c15d3f9e..9b0a5ac8 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 2.0) ++ + function(generate_cppgir target_name gir) + set(cppgir_loc ${cmake_helpers_loc}/external/glib/cppgir) + +@@ -17,6 +19,9 @@ function(generate_cppgir target_name gir) + ${cppgir_loc}/data/cppgir.ignore + ${cppgir_loc}/data/cppgir_unix.ignore + ) ++ if (CppGir_FOUND) ++ set(ignore_files) # rely on default ignore list ++ endif() + + set(gir_path) + if (IS_ABSOLUTE "${gir}") +@@ -33,7 +38,7 @@ function(generate_cppgir target_name gir) + --class + --class-full + --expected +- --ignore ++ "$<$:--ignore>" + "$" + --output + ${gen_dst} + +From eed39522952c15f448c54290454806dd011c4996 Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 2/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/generate_cppgir.cmake | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index 9b0a5ac8..2ad82277 100644 +--- a/external/glib/generate_cppgir.cmake ++++ b/external/glib/generate_cppgir.cmake +@@ -15,11 +15,12 @@ function(generate_cppgir target_name gir) + + set(gen_timestamp ${gen_dst}/${target_name}_cppgir.timestamp) + +- set(ignore_files +- ${cppgir_loc}/data/cppgir.ignore +- ${cppgir_loc}/data/cppgir_unix.ignore +- ) +- if (CppGir_FOUND) ++ if (NOT CppGir_FOUND) ++ set(ignore_files ++ ${cppgir_loc}/data/cppgir.ignore ++ ${cppgir_loc}/data/cppgir_unix.ignore ++ ) ++ else() + set(ignore_files) # rely on default ignore list + endif() + 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..f89d326a5c --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch @@ -0,0 +1,31 @@ +From a3ac6df0441b4caca28b1df87febc420e18942ce Mon Sep 17 00:00:00 2001 +From: Zephyr Lykos +Date: Mon, 23 Oct 2023 15:55:24 +0800 +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 8eaf19c5..344f9488 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) diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch index 486f0b1aa5..3317d0a9c1 100644 --- a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch @@ -17,10 +17,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index af7d24c21..66bec8fdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2647,6 +2647,9 @@ if (TG_OWT_USE_PROTOBUF) - list(APPEND export_targets proto) - endif() - +@@ -2647,5 +2647,8 @@ if (APPLE) + libyuv + ) +if (LIBSRTP_FOUND) + target_compile_definitions(tg_owt PRIVATE HAVE_LIBSRTP) +endif() diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index af16d4840b..91e743aff3 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2023 Lu Hui ;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; Copyright © 2024 Ricardo Wurmus +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,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) @@ -82,11 +84,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 "5.5.5") (define libyuv-for-telegram-desktop - (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") - (revision "2439")) + (let ((commit "04821d1e7d60845525e8db55c7bcd41ef5be9406") + (revision "2440")) (origin (method git-fetch) (uri (git-reference @@ -97,79 +99,84 @@ (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 "05a7db2e2d2a59ecf42483debca4944d09154b5b"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) + (patches + ;; https://github.com/desktop-app/cmake_helpers/pull/320 + ;; https://github.com/desktop-app/cmake_helpers/pull/305 + (search-patches "telegram-desktop-unbundle-gsl.patch" + "telegram-desktop-unbundle-cppgir.patch")) (sha256 (base32 - "0y96mvzs113zh8bdw1h3i6l0pgwg93rigrday8kfdg4magz686k6")))) + "1gapyk5a8rsl8vigbz0l8h9858f2lkhkd2pjy72zivp0mrq8w0hr")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "1a969faa0afb29d53af03e530775eccdfb8433f1"))) + (commit "0af136124083369073b8fdaf45f0816fd2b10bad"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1xmw8dfm51p5g20rlmzqnr72a14ngyxwq09an8clf1v5s6mmwvak")))) + "057bwn9smrgnyfb1vraf50ihbkhjc4d72msl7vnbqc4h5sg8dav9")))) (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 "547e7f2914d9b5548dd17e70a3a7bf5d6606afc3"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83")))) + "0sgm2prhd4fw89afh62k7i4i7mj60n170kqz50b0mad927zngxvn")))) (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 "c1d6b0273653095b10b4d0f4f7c30b614b690fd5"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "06mzafnjpfr5ih297dh7bxm6bgpg0wy0gv2r2732n5szyrg9sdl6")))) + "1sxn3qccsfbx1289z0fdrb4cggs16a8r75ic6wi81c6lnkrdi3wl")))) (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 (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_qr.git") - (commit "501f4c3502fd872ab4d777df8911bdac32de7c48"))) + (commit "6fdf60461444ba150e13ac36009c0ffce72c4c83"))) (file-name (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) + "1i5n3qvjkf4nv8k75cc0a71xyvpklc4nzg4k2zsfr2pxk0cy7hkw")))) (define lib-rpl-for-telegram-desktop (origin @@ -188,88 +195,88 @@ (define lib-spellcheck-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "ae89fefd239ecc47d4dab7ba29f9e230376a57d3"))) + (commit "e76981e133a1d29f3ceb557f53850a8d822f439a"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "147xbbcza5q4wcdipk5jplajzkc48971kg2s7qv5jlz33sxkw1lq")))) + "0dslsy3d6gmxaj6yv49zjgl2b2mh75j7fpnbynglr02h3m2fdj96")))) (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 "ccdc72548a5065b5991b4e06e610d76bc4f6023e"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) + "0b11ix95dzpkz335q0a6b5yg8qhj33s4fgj9ppl37pszcqq1j3wi")))) (define lib-tl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_tl.git") - (commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa"))) + (commit "237cbeb9d1c637759f89a508c1d854caf16e1984"))) (file-name (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk")))) + "1ji3gypy4yf9knsgylnyz5gc2kii7lls5ymj1rkf0daixdz931cm")))) (define lib-ui-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "37531086ec21a8569deddedb11b402f8a3157b90"))) + (commit "c4e3a08e6fb90a6174c8b592d9eb747dd4d3f9c5"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0")))) + "1lbfy4fbb52lklfwn6kxny3mwl653r4vc80k922kwjfgbcy9c25f")))) (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "b68a95ad4d1ae9a1827671100a7fd76cbe448c3f"))) + (commit "8751e27d50d2f26b5d20673e5ddba38e90953570"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1c8jwdnn26n13yp0rp0l71q6xlxa6wp3cspbm3pnghw964jwgp3z")))) + "0f05pqb83qckghzlhnwqbi9qfi9xw7qsv8jampl4qyaq9q0w9p20")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "f632fc84cbc62ae8abbbd05f81d472757a337c11"))) + (commit "2de655f58dc327e40d5d9df71300a0d0fdb39c9f"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i")))) + "12vrif0685vb068mj5sd7cknav1n66jysp18j21nlp0am9pw7ydj")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "2e2797648aac2588e7fe479c2e8b4455ec65c5e6"))) + (commit "9bf4065ea00cbed5e63cec348457ed13143459d0"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) + "1p563a11w8jrid96xf03dg6j39ciz28n5f4r6g28lxhiphbqzfym")))) (define-public webrtc-for-telegram-desktop - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") - (revision "389")) + (let ((commit "c425281150317753d7bc5182c6572abe20f9a784") + (revision "456")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -285,7 +292,7 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) + (base32 "1fj48iq56awnrckncy1qc3zhdzifl725hbb6an7wg2v3zmagvrwn")) (patches (search-patches ;; https://github.com/desktop-app/tg_owt/pull/123 @@ -407,7 +414,7 @@ (define libprisma-for-telegram-desktop (url "https://github.com/desktop-app/libprisma") (commit "23b0d70f9709da9b38561d5706891a134d18df76"))) (file-name - (git-file-name "libprisma-for-telegram-desktop" "5.3.2")) + (git-file-name "libprisma-for-telegram-desktop" %telegram-version)) (sha256 (base32 "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) @@ -427,7 +434,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) + (base32 "12fdybn085s3i3a8hwi0bmdns7jxvg0k662n04jgffirgsz8n54m")) (patches (search-patches ;; https://github.com/telegramdesktop/tdesktop/pull/24126 @@ -493,21 +500,45 @@ (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 'unpack-additional-sources 'use-system-xdg-desktop-portal + (lambda _ + (substitute* (list "Telegram/CMakeLists.txt" + "Telegram/lib_base/CMakeLists.txt") + (("\\$\\{third_party_loc\\}/xdg-desktop-portal/data") + (string-append #$(this-package-native-input "xdg-desktop-portal") + "/share/dbus-1/interfaces"))))) + ;; has to remove this constexpr otherwise cannot compile with gcc-final + (add-after 'use-system-xdg-desktop-portal 'patch-libwebview + (lambda _ + (substitute* "Telegram/lib_webview/webview/webview_interface.h" + (("constexpr ") "")))) (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 (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list `(,glib "bin") + (list cpp-ada-url-parser + `(,glib "bin") + gobject-introspection `(,gtk+ "bin") pkg-config - python-wrapper)) + python-wrapper + xdg-desktop-portal)) (inputs (list abseil-cpp-cxxstd17 alsa-lib + boost c++-gsl + cppgir-for-telegram-desktop crc32c + expected-lite fcitx-qt5 fcitx5-qt ffmpeg -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 07:35:59 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:59 +0000 Received: from localhost ([127.0.0.1]:37483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryP8-0001PH-MO for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:58 -0400 Received: from fhigh4-smtp.messagingengine.com ([103.168.172.155]:38367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryP5-0001Ol-8U for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:55 -0400 Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfhigh.phl.internal (Postfix) with ESMTP id 0196D114028E for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:30 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Sat, 21 Sep 2024 07:35:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726918529; x= 1727004929; bh=+IqDJxbRLKVJjItiYX3AsaO/kzsZWBwzD4y2x13OsLM=; b=k +PuTSaQ4dodSan3iBubF9UZ0EJb7bftjBALKqi46E7Ei2NSNgiJHlCA0ijN4/PJ2 Big9rkQJnkVO9Ygfw9fD1U3Pxzq5RjvAe0jDuvjFv2528kHDwb50rCkfWj+isSPr 7Owjevrk4yD5LF3ca8Pa3q3cXHT4if170KrU64hSsnlsY3IFDdc+STl7oTK4yT7O tcvByZ/j80uzPQFblj10b1QURAbX7KbPLmG89tl17cubiSYzbTvOTialO17qe2Xr oaJ0T30Ss5+NWPEHeT3mCNQISw0hhgCY8QypXzYJxKj3oyr7/kFh+3Qg9It2iB5o zlVrBBl2Fjq059Nli+pzw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726918529; x=1727004929; bh=+IqDJxbRLKVJj ItiYX3AsaO/kzsZWBwzD4y2x13OsLM=; b=ERV1BUeS9y3BVAcFdij+GupqSqgp1 1M5nRWEuPhPvaAhfBbSEmXZmPRqTAeXxg6tBeuuVPgE7ouIGRh+Ya/czKj+IKoWW nHK+esyfuWeR3ixMMccXftArl9Ck/scLsQMLUDjx/ssu+s5IcA8XBIPxUEqiE3t3 ef3pGcEyjba/9eH8j3uGcZF2ioIpErkqTYXNFWXtWD79ctTpqIiBeSfsS4aTbPjq nKsKuPFsZu7PAxZ9klNVDrfRApxu+R9MShGbrNidY/gA/jITPqW03QqlGTJ7OK8m zho1kpQa+4ChJj0SUPsushQG9XNErAy3RBEixCW54IJscf9xIA3aUrgkw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpeeffffftdehteetvdelieehgeehtedvteethefgte eivdetgeegtdejtdduudeludenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhep mhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgtphhtthhopedupdhmoh guvgepshhmthhpohhuthdprhgtphhtthhopeejudekleejseguvggssghughhsrdhgnhhu rdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:28 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v7 9/9] gnu: telegram-desktop: Disable jemalloc. Date: Sat, 21 Sep 2024 19:34:43 +0800 Message-ID: <185fc21ea297d89df26282d06e39aa2b0cf8664a.1726918430.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/telegram.scm: Disable jemalloc. Change-Id: Ia89ca0fef6ddaa9f6eb32637471110a0cec7ec54 --- gnu/packages/telegram.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 91e743aff3..327fd0d2b3 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -46,7 +46,6 @@ (define-module (gnu packages telegram) #:use-module (gnu packages gtk) #:use-module (gnu packages hunspell) #:use-module (gnu packages image) - #:use-module (gnu packages jemalloc) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages language) #:use-module (gnu packages libevent) @@ -475,7 +474,10 @@ (define-public telegram-desktop "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" - "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON") + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + ;; enabling jemalloc causes SIGSEGV. this probably happened + ;; after upgrading to glibc 2.39. + "-DDESKTOP_APP_DISABLE_JEMALLOC=ON") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'unpack-additional-sources @@ -547,7 +549,6 @@ (define-public telegram-desktop gtk+ hime hunspell - jemalloc kcoreaddons-5 kimageformats-5 libdispatch -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 07:39:29 2024 Received: (at control) by debbugs.gnu.org; 21 Sep 2024 11:39:29 +0000 Received: from localhost ([127.0.0.1]:37516 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srySX-0001WP-BE for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:39:29 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:52889) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srySV-0001WA-DG for control@debbugs.gnu.org; Sat, 21 Sep 2024 07:39:28 -0400 Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfout.phl.internal (Postfix) with ESMTP id 248D713802D8 for ; Sat, 21 Sep 2024 07:39:02 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-05.internal (MEProxy); Sat, 21 Sep 2024 07:39:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-type:content-type:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to; s=fm3; t=1726918742; x=1727005142; bh=f+kGvOQs8QXaBpWQrF5FFDYGfZPZYd+f 3DLVKwd8eGQ=; b=fUszD2tk43Cw5FL8t4UHmdqIOyyS786bJtu9+R4E7ftGGZfM rG16T9/JPN5s+tToADrIrlTCm6hZr1/3hPptoKAjyBHAZNAzxNn7gmYz6U5Qnbxt PxQL7kCLxS52eHhJCutDTKsdGgPMWU+BeVBIUoUT3w7bjuFj/YL6KXgsWECdc9EF znyTdNLjDtqrlVKf35KoF0tcdnEjOCmanWnCRncOBD7mSX4CQrxgtkTYUscDymBJ vg3pKll3bnkyFGOojT4o5/BYg4xkLXY0RO7wia1Qtw23qQVWApY8jEz0efcSAsGb ZorJ8U//AddKjK5I/rhK3SljYsMKZwir2lvM2A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1726918742; x=1727005142; bh=f+kGvOQs8QXaBpWQrF5FFDYGfZPZYd+f3DL VKwd8eGQ=; b=CX2nhiBtWzPSypQuB7USY/XAo2bTAfdjyOKT1tuuolCyA2WytJd KCEA2M5GItYu/vS7DlilDfsdyc2Fn0oNWCWcchHHgDxMDsFfTri3oy9R8TnwWWOu J4OC42FX74N1e+WMP+m3WDYuyXC9FQLkZUcpCD2wH6MIwuIGfU5Z4j5lB3sCiZlk UXnaZktKvhO+VbqqLFHhrJjmnU2XP1dD+aupeoScYXuU/HojoX0MuCh67CzhC6Ql SYC6ugYMPFs59riu+101o3OxbgQ1raPGQTzC7zgj4OyXgglsUfFAvaQ37qXHwd33 70Td3+wzfq42/Au/feKh4Krtxsm6XTSZkZw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkgggtsehttdertddttddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheq necuggftrfgrthhtvghrnhepudfhudfffeegudekgfdvieelgffhfeekgfdvueeggfeuvd ejteekuddtudejheeunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghi lhhfrhhomhepihesuggrnhdrghgrmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpe hsmhhtphhouhhtpdhrtghpthhtoheptghonhhtrhholhesuggvsggsuhhgshdrghhnuhdr ohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sat, 21 Sep 2024 07:39:01 -0400 (EDT) From: dan To: control@debbugs.gnu.org Subject: retitle 71897 Date: Sat, 21 Sep 2024 19:38:58 +0800 Message-ID: <87ldzl6xt9.fsf@dan.games> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) retitle 71897 [PATCH 0/9] gnu: telegram-desktop: Update to 5.5.5. quit From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 10:07:00 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:07:01 +0000 Received: from localhost ([127.0.0.1]:40076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss0lI-00021K-JA for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:07:00 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:57620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss0lG-000213-Qx for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:06:59 -0400 Received: by mail-wm1-f65.google.com with SMTP id 5b1f17b1804b1-42e5e1e6d37so28099855e9.3 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726927533; x=1727532333; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=BvikVJNU9d+BS8Arsw5ZyTuhm/5lW9qp3ejf33ICZDo=; b=TTCAqeeVRR9mNF8KKnUH3if3A7LrBSzZx4bjzjaoRkvNI94acKtpyRwcWjgLVDjPY7 UFWB/HnWPW+5dVsy41R1sdv9GtGMKv81S6Q4mPDy24Ks/mddTmGkM++wL1bgvMHanJKw IBWHrq43vXNZw2iJTiyw1B27VMDDTp8eUeIMLVVnHfHcNcm8cPWYybSWDH29FnLtvI3J 8X9JUDJAJgSxVFdelrsa+OzVLFuKAHNDUBSpoNKkbjZS2IYCTPJZWqtvpJhWgcdbSJeM JCIBzJEIHFPskD2ijjCF48RyFuWlLjjAq5K83Q8e6SrkWJnVrF/gxGi1fcxbRrrVq/Fe uYWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726927533; x=1727532333; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=BvikVJNU9d+BS8Arsw5ZyTuhm/5lW9qp3ejf33ICZDo=; b=TTsT6mfo9upsU7ON+y10ONx8eZlq9tm2tqe8eJ3A+3A1tqrecj0bK/TbQPvUcMRCxq tRZ6nfC/dCVu1x37qmFjx4byz02zxMp0Zao7XV93lSE0kEnwGmb62Vc64OgatAlSk8J6 6vqeUjWhHc4R3MqSspnYG4r4UR/D9pDQo0loLV6vfXrMI7p04YemP+AveQftFWaqhV5J tOEvWpuis5F2yhvoYXQ6finkWnSsDmLCXxDlGOsiNspHN+BU7lUUzd2UtMdIfiAwg4mw pC74OKHaX7Y4OQCGaAw2ff3FAa8xnPw4c4H/KzqzNVNg8Nt1ILpjAnhmdlO38hCP8q5X O3JQ== X-Gm-Message-State: AOJu0YyfeTWBOYZ7bT0YNaTTpD50IeI+yAPltWWALIwPsAsxjClXMe6j pLey0BpMb+H7MneTiExNHB/fEytt5IE84dkN+QeFP1DQFH2I61BE X-Google-Smtp-Source: AGHT+IF7/jjU9JfxXpkU2BosVsMnzBXozqB9B1rgK53jN4+FfBbyNOTpPrYdeBorgP+K93y1ZOVfIw== X-Received: by 2002:a05:600c:3b18:b0:42c:b187:bdeb with SMTP id 5b1f17b1804b1-42e7c1a4676mr41044675e9.29.1726927532533; Sat, 21 Sep 2024 07:05:32 -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 5b1f17b1804b1-42e754a619dsm78870935e9.30.2024.09.21.07.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2024 07:05:32 -0700 (PDT) Message-ID: <545827af7e5bfec122e649b96e7345f11f1b3262.camel@gmail.com> Subject: Re: [PATCH 0/3] gnu: telegram-desktop: Update to 5.2.1. From: Liliana Marie Prikler To: dan , Sharlatan Hellseher Date: Sat, 21 Sep 2024 16:05:30 +0200 In-Reply-To: <87plox70ra.fsf@dan.games> References: <8734lxb7wc.fsf@gmail.com> <87plox70ra.fsf@dan.games> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Maxim Cournoyer , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 21.09.2024 um 18:35 +0800 schrieb dan: > Would like to know if it's appropriate for me to disable jemalloc=20 > for telegram-desktop. I don't see an issue with that =E2=80=93 though do check whether they vendo= r their own jemalloc if you "disable" it. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 10:15:31 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:15:31 +0000 Received: from localhost ([127.0.0.1]:40089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss0tX-0002W0-8Z for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:15:31 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:49585) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss0tV-0002OC-Li for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:15:30 -0400 Received: by mail-wm1-f68.google.com with SMTP id 5b1f17b1804b1-42cacabd2e0so24653985e9.3 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:15:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726928043; x=1727532843; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=LDyb2t4bFWTfmepj3AEkyGbnFJvDkGJrOqdq1jWpK1w=; b=Px7JirZ0G2QkgRJGpo+1BTmIbLU0eR0NkkT8WllnFY22DwySn6/eqRe4bourWuKDmQ +sUFn7SH1Uc1Cn8fy3BqD/goLMjFsIuQGIAtQtrDZxHOX5kWER+/q7X0+pOag3zWFUGZ nU1elU8DZMJa+C7mGDWUwBK4CCjZQjVKaxa2IgvwS36dbCW9QAIF1FTQ0aCfKO/FQFhs 23x2xp1GWUIPTBQKpAxzdk2FKNekeiR8cjXPIRNVWBkPOPQweHtwvPJcPqyL4qUE1YoN rVYEH+d1ITcX9g7dRcQYbMLi+ubSanP2fpTMC35UjA+cKwO+A7Oi6X9HFJrB8aScqTxA BesQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726928043; x=1727532843; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=LDyb2t4bFWTfmepj3AEkyGbnFJvDkGJrOqdq1jWpK1w=; b=rrn5ZF1ySrlApVFVCHv1xT3P/asE/MHPtSrtWBTmJEw7F7zt8MTBS3sC+c457W5Hvy UVRv7wLlmK5Wx1n48RX3Z3ZiVc3iRsPz8br4Zy+xWUZIG0iUksRkHnjNgIdiJmAHALRQ l+nVuJwGIJcaEVZs8eErIoWT7yC/EHPm7kChyl73dts84iyhXwMrxZQmd+cWt5uyjIiu AMjtaRMBfMu97xFlerqzwHrOCecCapVqAJo52C4n7P36D0d9jvFPWRpth31j4Ldwu5zE Gq1w4JK3aBz3xNwy9l5p87AEfRYEjwkf9XqWwuHTEB04kgBkKw7ubQf06luZEB4N77QS VCtw== X-Forwarded-Encrypted: i=1; AJvYcCVwQqHvAtXa4jLUaetjg/xX2JSvWLp3mctthSQj4V8xTChGr7LmOv3FVXaLu2wOkFDrCEeSpg==@debbugs.gnu.org X-Gm-Message-State: AOJu0YwK6dE4FUgA77ngtORjHo6QA/SndGlyGxI15nQFVY8kZNojQfdP 8GUFlTnUla79IGTJ8y/wrLngR0eb+K1czcRAyh2aRGYh/sDZzWjJxec7uxJB X-Google-Smtp-Source: AGHT+IEAtfcQu0O5So7q2+AHzO2wEP0ozh3j9PpJi4exxSQYzv2KAEG1ENam5QFoZb3V2yf5m237GA== X-Received: by 2002:a05:6000:1f0b:b0:374:c847:848 with SMTP id ffacd0b85a97d-37a4236e3b5mr3221147f8f.36.1726928043375; Sat, 21 Sep 2024 07:14:03 -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 ffacd0b85a97d-378e73e8204sm20085516f8f.47.2024.09.21.07.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2024 07:14:02 -0700 (PDT) Message-ID: Subject: Re: [bug#71897] [PATCH v7 1/9] gnu: xdg-desktop-portal: Update to 1.18.4. From: Liliana Marie Prikler To: dan , 71897@debbugs.gnu.org Date: Sat, 21 Sep 2024 16:14:00 +0200 In-Reply-To: References: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@dan.games> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Am Samstag, dem 21.09.2024 um 19:34 +0800 schrieb dan: > * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: > New file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/pack [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.68 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.68 listed in wl.mailspike.net] 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.128.68 listed in bl.score.senderscore.com] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 71897 Cc: Sharlatan Hellseher , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Am Samstag, dem 21.09.2024 um 19:34 +0800 schrieb dan: > * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: > New file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to > 1.18.4. > [patches]: Disable portal tests. > [native-inputs]: Remove autoconf, automake, libtool and which.=C2=A0 Add > python, > python-dbusmock, python-pytest and python-pytest-xdist. > [inputs]: Add bubblewrap. > [phases]<#:configure-flags>: Update flags to meson options. >=20 > Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 > --- Note: this has already been reviewed for gnome-team and ought to be cherry-picked from there. Same with 2/9. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 10:17:01 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:17:01 +0000 Received: from localhost ([127.0.0.1]:40093 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss0uy-0002Yb-MM for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:17:00 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:60529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss0ux-0002YM-BO for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:16:59 -0400 Received: by mail-wr1-f67.google.com with SMTP id ffacd0b85a97d-3780c8d689aso1980713f8f.0 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:16:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726928133; x=1727532933; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=pytLWCxKBKlQYDGK/lqqjJebZrFWaqye7XsOvxuDKTs=; b=nf3pWzMjzOa+PDTawdPFgSwGnmcD3unL6di7BzpoHzCcdE9RvgCeDCamWGy2Ye+ou7 NyYWrmklo6B7YNUCWZa4QDs+61hvuBdfAZ8FhQlsWXlNNbwU4tT+vM8PXVxsmWhlu9CK VQK5u/gLH9tTR8NiFF0bxvOzToEc9uJK+xInR4IUr1jv76YMkGSROOAgfMvtp6tC+EvU bqLhQ2qz02/rO+fSHiKFSsDPJESmZYik546WZLK3JXPcrod1nSlla0WETnoJry7qGxXi psvUo7DSQpKCxuDx9qB0+aXeljuj/p8hVdrc4J9tkuNGrD8osJuK1UnDg/mhpzw+sxlQ t4Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726928133; x=1727532933; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=pytLWCxKBKlQYDGK/lqqjJebZrFWaqye7XsOvxuDKTs=; b=sA9agEYDoJU3HkTmusXACMXJWb29/j3jyk8UoWUiNDWD1q4unTWbeTNWrD8io6jIzk eQUG8lF+GBGsGyOwth+4T4sLe5VEkXe3vF6qSIngrFMRqQqIs9ZWLrwW74aU3Xd1oBdS M79sTdwREFo3YQBcxPaqWydAWY5MIF45fmSagJyIv7CYtjOXHKYtN/CwKX02XLg2fsxr +PNjx/QWjcbiS5KYenKfNMi0qBLGb8dZEN2OI1XAOze7a1lzV6fMfcHK+95IEume6oZm qCVC4A4bQZO6EjCYR4RJRWSuP5OIab7lMiwGM1ggvdPdPaMcUCRtAKS9LDZUxuaxUubA 5O0A== X-Forwarded-Encrypted: i=1; AJvYcCUeLSE9G8zhh92dNxLmCn+RalWcs3OyxMuso9kkf7JrZJ1cc4MQNejLsJcgFfrGYNfRTI3yTg==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yy86jWgvHUi+SDRj8NHBzqXWwtgRKg+MHsIF1xVcwuagerL/Sk5 +3qiJRDZ/tTSy9mLDTeApyD5iWw6ruU9xccwFciuRbNXXRyQ0wO0 X-Google-Smtp-Source: AGHT+IFRoA0jwsF9XSLvW9SrXS+0czff7ny1cYM2O3HIZbJU+Rq53hd14kIKSlFS2YPOk4i9TnQTtw== X-Received: by 2002:a5d:6283:0:b0:374:c6af:165f with SMTP id ffacd0b85a97d-37a4312abc0mr3937975f8f.12.1726928133193; Sat, 21 Sep 2024 07:15:33 -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 ffacd0b85a97d-378e73f9880sm20017410f8f.56.2024.09.21.07.15.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2024 07:15:31 -0700 (PDT) Message-ID: <527224e799460e626da96a1d10a5e663edc12b19.camel@gmail.com> Subject: Re: [bug#71897] [PATCH v7 9/9] gnu: telegram-desktop: Disable jemalloc. From: Liliana Marie Prikler To: dan , 71897@debbugs.gnu.org Date: Sat, 21 Sep 2024 16:15:30 +0200 In-Reply-To: <185fc21ea297d89df26282d06e39aa2b0cf8664a.1726918430.git.i@dan.games> References: <185fc21ea297d89df26282d06e39aa2b0cf8664a.1726918430.git.i@dan.games> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Sharlatan Hellseher , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 21.09.2024 um 19:34 +0800 schrieb dan: > * gnu/packages/telegram.scm: Disable jemalloc. >=20 > Change-Id: Ia89ca0fef6ddaa9f6eb32637471110a0cec7ec54 > --- > =C2=A0gnu/packages/telegram.scm | 7 ++++--- > =C2=A01 file changed, 4 insertions(+), 3 deletions(-) >=20 > diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm > index 91e743aff3..327fd0d2b3 100644 > --- a/gnu/packages/telegram.scm > +++ b/gnu/packages/telegram.scm > @@ -46,7 +46,6 @@ (define-module (gnu packages telegram) > =C2=A0=C2=A0 #:use-module (gnu packages gtk) > =C2=A0=C2=A0 #:use-module (gnu packages hunspell) > =C2=A0=C2=A0 #:use-module (gnu packages image) > -=C2=A0 #:use-module (gnu packages jemalloc) > =C2=A0=C2=A0 #:use-module (gnu packages kde-frameworks) > =C2=A0=C2=A0 #:use-module (gnu packages language) > =C2=A0=C2=A0 #:use-module (gnu packages libevent) > @@ -475,7 +474,10 @@ (define-public telegram-desktop > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=3DON" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=3DON" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 "-DDESKTOP_APP_DISABLE_AUTOUPDATE=3DON" > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=3DON") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=3DON" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 ;; enabling jemalloc causes SIGSEGV.=C2=A0 this probably > happened > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 ;; after upgrading to glibc 2.39. > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 "-DDESKTOP_APP_DISABLE_JEMALLOC=3DON") Since this is required for build, it should be squashed into the previous commit.=20 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 10:19:37 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:19:37 +0000 Received: from localhost ([127.0.0.1]:40097 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss0xV-0002d6-6e for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:19:37 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:46093) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss0xT-0002ct-2G for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:19:35 -0400 Received: by mail-wm1-f66.google.com with SMTP id 5b1f17b1804b1-42cb1e623d1so27274975e9.0 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726928289; x=1727533089; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=HjEUm7BCMN/tLI+vZ5HIjx479KTXkBof06iD83ks6yE=; b=EkAluo7nJTJuZBU767qI6+Otq0dg6wu8aF+nOOfDxArI2F2lOpEJv+UJy/ZqpLnYhL Bx98iwCRntfzCqBGgrhi6/4GgNc7QhPrtn6jAMcUoPr7LAT1oR2wD1qPzYCSBZa3drXa khdCGOCqNxVZGnZ1WyUwCxvKwUMOO4mxZGDFToJY6TQS4y8fYrXRsZaam6GdPMzvTw/d afyVweHxIMz9LNzRecugTtE9z2sHDyYaGxE1IbWNdA7IpIwvD9NKQ2yLHEWmemc+XjwS FmKe8y9nlMPOcbAFm7P35AZFj7ldX4C4FO8dMw7zEEO9OyZDVmSyZE6w0pJ0QhD7b1Zk fkxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726928289; x=1727533089; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=HjEUm7BCMN/tLI+vZ5HIjx479KTXkBof06iD83ks6yE=; b=oFSJNspXEPNsJ8v8F6DW7Od33s2Q8TQCX6hfnkSzPTZrJL6iJxG/b4uvoEI24gikVa z/598LjElbHaxMbhKOIy10t0BGNmUXYl1VSzruCCV8N7fpX6UvOAxG1Jm1ERMliMfYDo VHer288bz47D2OmhCN3mINdfR7SB7suCcMJ8RXIo50Q+njleweyVIW1nq/uSDQEQYwSC PGwVPkKbIamPdF+3/h8WbDJ4yTIkIaAznoth+41Ten+ASn3VNzff2CasWtMedU/pwp5H Ye3fwOILDqHsVHT/FiVOGz9Nb5CiEHj6CRmDaJuV8+4RoYpvtNEmZ93OgEiyV9bM9zem 09SA== X-Forwarded-Encrypted: i=1; AJvYcCUVEzkYf3mk6J1sTp97rHRHByqfkT/jxuWa1dSn8ZUdYBjItVZlLurbk1lOrSYuEAHNQRNLaQ==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yy6YYTK5o4vhnov7vmxI0bIsvZ0iYLHaUdaQh0Mqsygh1TnSCej va9IkcaVB4vs9qiYtAO6d8NftEOJmQRnlYlCZv/GVL/RRfVDBaJ/ X-Google-Smtp-Source: AGHT+IG7f1NQLPkfNzBwzSvwBz3+OuJWcKL35JnrCLUx2BP7OVDc83Gk2vel0BQhE9qU9ZErw8szVg== X-Received: by 2002:a05:600c:4f07:b0:42c:b905:2c04 with SMTP id 5b1f17b1804b1-42e7abfdaf8mr34978075e9.12.1726928288600; Sat, 21 Sep 2024 07:18:08 -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 ffacd0b85a97d-378e7800243sm20090097f8f.86.2024.09.21.07.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2024 07:18:08 -0700 (PDT) Message-ID: Subject: Re: [bug#71897] [PATCH v7 8/9] gnu: telegram-desktop: Update to 5.5.5. From: Liliana Marie Prikler To: dan , 71897@debbugs.gnu.org Date: Sat, 21 Sep 2024 16:18:07 +0200 In-Reply-To: <2320704096aebf544e4b992a631ea74674d30868.1726918430.git.i@dan.games> References: <2320704096aebf544e4b992a631ea74674d30868.1726918430.git.i@dan.games> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Sharlatan Hellseher , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 21.09.2024 um 19:34 +0800 schrieb dan: > * gnu/packages/patches/telegram-desktop-allow-disable- > libtgvoip.patch: Update > patch file to match upstream changes. > * gnu/packages/patches/webrtc-for-telegram-desktop-unbundle- > libsrtp.patch: > Update patch file to match upstream changes. Not sure if this is just formatting of the mail client, but there shouldn't be any line breaks between the star and the file or in "patch". > * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New > file. > * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. > * gnu/local.mk (dist_patch_DATA): register them. Upcase "Register". > * gnu/packages/telegram.scm: > (libyuv-for-telegram-desktop, cmake-helpers-for-telegram-desktop, ChangeLog uses closing parentheses on each line. > 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)[origin]: Add patches to unbundle > gsl and > cppgir. > (libprisma-for-telegram-desktop): Use %telegram-version. > (telegram-desktop): Update to 5.5.5. > [#:phases]: Add libprisma-for-telegram- > desktop. > : New phase. > : New phase. > : New phase. > [native-inputs]: Add ada, gobject-introspection and xdg-desktop- > portal. Note: ada is cpp-ada-url-parser. > [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite. >=20 > Change-Id: I78df3434a2cd04afc54107b7fecd5e5a8df85564 > * gnu/packages/patches/telegram-desktop-allow-disable- > libtgvoip.patch: Uhm, what happened here? Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 10:54:07 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:07 +0000 Received: from localhost ([127.0.0.1]:40138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1Us-0004Zy-Cp for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:07 -0400 Received: from fhigh6-smtp.messagingengine.com ([103.168.172.157]:39905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1Up-0004ZL-Hz for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:05 -0400 Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfhigh.phl.internal (Postfix) with ESMTP id 9E081114016B; Sat, 21 Sep 2024 10:53:37 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Sat, 21 Sep 2024 10:53:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm3; t=1726930417; x=1727016817; bh=dy FA0JqYo6Te3ilJ5+v/D93YhSgGAadoel0JH4n25lc=; b=Yva+iDcb4mAAdibl2d uP4VGEStB3pNnOIvdEF6MQevOFDrJwrmW26kdI0fwvHTYI+TCVpNPUbWk6iAbL4F O8OCrCdMHpwW3PKa8M3FG+Zfk5P5P1Zl8mKqAra5+W3SaTcEgArQSXUhmPExWQFy TUTJl2/aF84GjYSHjCw00crhdPJZxhERZvpo8GCKkYiesUrkbzf65hQkohFDcxzW +DapdUjwpGh5NHCFZmX9U6pMPNdQGSWEgu8l+u9GOI1AZc2hh2oXltYr8xIjUS78 4UcXADisnzK9Stf2U6TLOihZ43IBhwfa2179qzwgrh6Q30q7YYMqCf3Gs8FT5wxn e8ig== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726930417; x=1727016817; bh=dyFA0JqYo6Te3 ilJ5+v/D93YhSgGAadoel0JH4n25lc=; b=P5IjVUH4eTglYF3wnL0ZEe5kM5ajP tIxk6rFlALSB4Xk6j8wYLbTCbVyO4k6/+ymkM8nlZEqsPIBTvshwi4Z53kVRLOzc 9Phmi0N7t8V4tJHSQY7xlVXfELUBDq8o+ouelonvgzMa8b1/vo5ipq1TtSFzJuG3 Thw4fuf5S5iV+YajvNJeTYZdbnWogFyp/8zNnEEVo/Ef/tDS/EOz0/zKKUqqK5B4 l9UIMJACoLk27sjVItxU9dwmz6jSTQ8FeRCIxh0IgyliqXf6hvW9CP+a1xttaq8J JbSI9fxSib+BuuxJ7iUkOAKvxUoM9xVcTDvqT/7b4TD+0+CIcaG0c3h3Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofggtgfgsehtkeertdertdejnecu hfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghrnhepje efheegveffgefhuedtkeegueevleeiueejgffgjeffvdejleevtdejleelieehnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepfedpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehmrgigih hmrdgtohhurhhnohihvghrsehgmhgrihhlrdgtohhmpdhrtghpthhtoheplhhilhhirghn rgdrphhrihhklhgvrhesghhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 21 Sep 2024 10:53:35 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v8 1/8] gnu: xdg-desktop-portal: Update to 1.18.4. Date: Sat, 21 Sep 2024 22:53:07 +0800 Message-ID: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 Cc: Liliana Marie Prikler , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.18.4. [patches]: Disable portal tests. [native-inputs]: Remove autoconf, automake, libtool and which. Add python, python-dbusmock, python-pytest and python-pytest-xdist. [inputs]: Add bubblewrap. [arguments]<#:configure-flags>: Replace “--with-systemd=no” with “-Dsystemd=disabled”. Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 25 +++++---- ...-desktop-portal-disable-portal-tests.patch | 56 +++++++++++++++++++ 3 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8e7abc8a47..802f4be4fe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2303,6 +2303,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-dbus-group-policy.patch \ %D%/packages/patches/x265-arm-flags.patch \ + %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xen-docs-use-predictable-ordering.patch \ %D%/packages/patches/xen-remove-config.gz-timestamp.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 993bb84ec6..f00f4b3956 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2024 aurtzy ;;; Copyright © 2024 Dariqq ;;; Copyright © 2024 Wilko Meyer +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -136,6 +137,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages video) + #:use-module (gnu packages virtualization) #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -2986,7 +2988,7 @@ (define-public libportal (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.16.0") + (version "1.18.4") (source (origin (method url-fetch) @@ -2995,18 +2997,21 @@ (define-public xdg-desktop-portal version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav")))) - (build-system gnu-build-system) + "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q")) + ;; Disable portal tests since they try to use fuse. + (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("glib:bin" ,glib "bin") - ("which" ,which) - ("gettext" ,gettext-minimal))) + ("gettext" ,gettext-minimal) + ("python" ,python) + ("python-dbusmock" ,python-dbusmock) + ("python-pytest" ,python-pytest) + ("python-pytest-xdist" ,python-pytest-xdist))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) + `(("bubblewrap" ,bubblewrap) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("flatpak" ,flatpak) ("fontconfig" ,fontconfig) @@ -3018,7 +3023,7 @@ (define-public xdg-desktop-portal ("fuse" ,fuse))) (arguments `(#:configure-flags - (list "--with-systemd=no") + (list "-Dsystemd=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'po-chmod diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch new file mode 100644 index 0000000000..5e13493613 --- /dev/null +++ b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch @@ -0,0 +1,56 @@ +From b7750fa99c31c5f28ac2053fa154bef4038b5cc0 Mon Sep 17 00:00:00 2001 +From: dan +Date: Tue, 2 Jul 2024 19:37:38 +0800 +Subject: [PATCH] tests: remove portal tests. + +--- + tests/meson.build | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index a2dafee..bcd87be 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -181,18 +181,6 @@ portal_tests = [ + + test_env = env_tests + test_env.set('XDG_CURRENT_DESKTOP', 'test') +-foreach p : portal_tests +- test( +- 'test-portals-@0@'.format(p), +- test_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/portal/@0@'.format(p)], +- depends: [test_backends, test_portals], +- env: test_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + # Split the portal tests into one test per portal, this makes debugging a lot + # easier. +@@ -204,18 +192,6 @@ portal_limited = [ + + limited_env = env_tests + limited_env.set('XDG_CURRENT_DESKTOP', 'limited') +-foreach p : portal_limited +- test( +- 'limited-portals-@0@'.format(p), +- limited_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/limited/@0@'.format(p)], +- depends: [test_backends, limited_portals], +- env: limited_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + if enable_installed_tests + install_data( + +base-commit: 11c8a96b147aeae70e3f770313f93b367d53fedd +-- +2.41.0 + base-commit: 9d75215a59629ab224154ef6b843043289291f81 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 10:54:09 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:09 +0000 Received: from localhost ([127.0.0.1]:40142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1Uv-0004aG-6U for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:09 -0400 Received: from fhigh6-smtp.messagingengine.com ([103.168.172.157]:41739) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1Us-0004ZR-Ll for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:06 -0400 Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfhigh.phl.internal (Postfix) with ESMTP id 352771140176; Sat, 21 Sep 2024 10:53:41 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Sat, 21 Sep 2024 10:53:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726930421; x= 1727016821; bh=PjRv13WVoLXsDBl8YiHekQ1g5nLCBIkZ1hYpujGR5v4=; b=s iQ7UsHgRbzjZC77wLRixSVqFAFPQvYz52Hz71igR4vwk0XxR4m2bscSsd4er30F4 rFpNMYG0g07mYf+zAQXl1gAtcAQ5G7UYwz9rDxpZGUc2CWPfWRaLXzuj/csGa5ps FuF46Fbo+QoitbQU+bTCrkxGBFR4PwM5dO4dTa2xlAfwRuUpe/dKXY7bbab/rzAw 2UjEuLpIGBs071QCXE9b9+7uRLytHfqmskNJJtsqDBjIPQY4sOi1eMhJhTpYadX4 0sIB6qaq01MDD0OQA/EU8ifkgdIZNgkPPORNFbvLD4Gg3p3dAeeUf4c4b4DCtsG8 m/32qPZilO+60bWU164Fg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1726930421; x= 1727016821; bh=PjRv13WVoLXsDBl8YiHekQ1g5nLCBIkZ1hYpujGR5v4=; b=J sbn8aHgzEhuacJK7HXRGgIRPSK3JU3hOrLjAp1KEDsUzxREn4cAU2yrxdQlO1j1J ehMzQt5uq8hxz5J+AbibntM9Osqh/eJoIzReT3wh/uglYeDfeeK0Kg3raSYz3P8x uMx+KpNSKLZk3TFOOw9ZWYC8pZdUbYz6DiMilQrbjBPkvRFcgJPqakinmlansScZ lQVBqvyJorVH7T4oRo22bU2BsDw/eZVeyvqvyAvZPWKf37F94vPhcY3bF9Z/2M3e TLE7TyA2oKn5uBRUyqtKtftZifJrYJ495MjdTQrxN0l2LTzhMHxYpUf4HKj7Y2of Li84bV97z8PPf1MmI7v9w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredttden ucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgvrhhnpe dtgeekheeggeettdevtedufedtfffhuddtvedtueeugfegtdettddutedtgedtleenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrd hgrghmvghspdhnsggprhgtphhtthhopeefpdhmohguvgepshhmthhpohhuthdprhgtphht thhopeejudekleejseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtoheplhhilh hirghnrgdrphhrihhklhgvrhesghhmrghilhdrtghomhdprhgtphhtthhopehmrgigihhm rdgtohhurhhnohihvghrsehgmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 21 Sep 2024 10:53:39 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v8 2/8] gnu: xdg-desktop-portal: Improve style. Date: Sat, 21 Sep 2024 22:53:08 +0800 Message-ID: <1a93898a36b7b639bb04e077c717c170abe3a05d.1726930328.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 Cc: Liliana Marie Prikler , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Liliana Marie Prikler * gnu/packages/freedesktop.scm (xdg-desktop-portal) [inputs]: Move after arguments. Drop labels. [native-inputs]: Move after inputs. Drop labels. Reviewed-by: Maxim Cournoyer --- gnu/packages/freedesktop.scm | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index f00f4b3956..664adf0cb2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3001,26 +3001,6 @@ (define-public xdg-desktop-portal ;; Disable portal tests since they try to use fuse. (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) (build-system meson-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("glib:bin" ,glib "bin") - ("gettext" ,gettext-minimal) - ("python" ,python) - ("python-dbusmock" ,python-dbusmock) - ("python-pytest" ,python-pytest) - ("python-pytest-xdist" ,python-pytest-xdist))) - (inputs - `(("bubblewrap" ,bubblewrap) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) - ("flatpak" ,flatpak) - ("fontconfig" ,fontconfig) - ("json-glib" ,json-glib) - ("libportal" ,libportal) - ("dbus" ,dbus) - ("geoclue" ,geoclue) - ("pipewire" ,pipewire) - ("fuse" ,fuse))) (arguments `(#:configure-flags (list "-Dsystemd=disabled") @@ -3034,6 +3014,26 @@ (define-public xdg-desktop-portal (find-files "po" "\\.po$")))) (add-after 'unpack 'set-home-directory (lambda _ (setenv "HOME" "/tmp")))))) + (inputs + (list bubblewrap + dbus + flatpak + fontconfig + fuse + gdk-pixbuf + geoclue + glib + json-glib + libportal + pipewire)) + (native-inputs + (list gettext-minimal + `(,glib "bin") + pkg-config + python + python-dbusmock + python-pytest + python-pytest-xdist)) (native-search-paths (list (search-path-specification (variable "XDG_DESKTOP_PORTAL_DIR") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 10:54:15 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:15 +0000 Received: from localhost ([127.0.0.1]:40148 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1V0-0004ai-It for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:15 -0400 Received: from fout1-smtp.messagingengine.com ([103.168.172.144]:53051) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1Uv-0004Zm-I5 for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:10 -0400 Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfout.phl.internal (Postfix) with ESMTP id 077B4138013A for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:44 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Sat, 21 Sep 2024 10:53:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1726930424; x=1727016824; bh=E3vBdmd4NNiyPGZwq+rt33Ii907fOXVEULqddZJmwhE=; b= ng4ElA+k98ILmc4GHXbHdzLotqlfFZ/mLNXObvq0X7jjrYkmS9KuPJoTWxN9z2KV Yl9FJEF580sN/97igdqwERvY1A2G61fC7c3A+F2rzzWmmDnmY+YkeA6BjyUaxalW RWn0AXVDDfTjHncUBZ1RFgqE4Ao5Lwdv2pLzvqL/o9/FI1z6MGE9G0kSa9Jpg3PP /VuWbOIrGJtVyAxQbgpo8vy/X7awDqKPVOE60Da9ScdzdLqaG5WSJYFM0I0VYlTJ 7BqNj+fL8lgnkkrK56lOfXv2m5vV6jN8KRSdyizXBA4UtZNJDkH0Pw6xQfzs/Zr5 Gct69RbNB2hg5iRbkdy4Fg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1726930424; x= 1727016824; bh=E3vBdmd4NNiyPGZwq+rt33Ii907fOXVEULqddZJmwhE=; b=E 0GP+2CWhWwysBDE0dhK5u/YN3AzuuaWhbtRpMceoli7+5rK1Xw1iFb5oIrf4F/w+ k+QpxTye63GWzaTD/IVaZq9Izx028yw7m09zhzD0RWKfQ/x7UugU7FVMzlSX2p0T Cq76V/vlXzYQ24O+UW6loQZ1CCNfEk73Q0L0FId5pkzcKx7x30ieaY4QK1QGN4pA PF8A8nWvrkHPqrpD8dFHRgjqGYf5BMBkC3ShzlASovZpc7CAR3BYUrC9QG5PANJo aNvXELPcYvCsNDQAdnuL0bhX3CCcrZFaS6eZEDSYG5npHqqwEPjcUE+igLqkhxN1 bg6Zs7znmkaQaPE7QCqug== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgr mhgvsheqnecuggftrfgrthhtvghrnhepgfettddtgfdttdeiffdufeefleegtddutddvve ehkedtieefvdeifeeiffeijeeunecuffhomhgrihhnpehgihhtlhgrsgdrtghomhenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrd hgrghmvghspdhnsggprhgtphhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphht thhopeejudekleejseguvggssghughhsrdhgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:42 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v8 3/8] gnu: Add cppgir. Date: Sat, 21 Sep 2024 22:53:09 +0800 Message-ID: <63bc539416af351630e1008c30c311a62b3c1201.1726930328.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher , Vivien Kraus Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/glib.scm (cppgir): New variable. Change-Id: Ic4510be6d05b7b3977aa457c6a7fec382c1d3a88 --- gnu/packages/glib.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d6275ea63e..f695d065b3 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2021, 2024 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver @@ -21,6 +21,7 @@ ;;; Copyright © 2023 Saku Laesvuori ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Remco van 't Veer +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -72,6 +73,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) @@ -1592,3 +1594,30 @@ (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 "2.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cj4myqzb28hgb7zlxlba9y8n4ysxkvv2y9wy6f7ps58mr18h7bl")))) + (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 "GObject introspection C++ binding wrapper generator") + (description "cppgir processes .gir files derived from GObject +introspection annotations into a set of C++ files defining suitable +namespaces, classes and other types that together form a C++ binding.") + (license license:expat))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 10:54:15 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:15 +0000 Received: from localhost ([127.0.0.1]:40152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1V1-0004ak-5N for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:15 -0400 Received: from fout1-smtp.messagingengine.com ([103.168.172.144]:52485) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1Uy-0004a5-4x for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:12 -0400 Received: from phl-compute-07.internal (phl-compute-07.phl.internal [10.202.2.47]) by mailfout.phl.internal (Postfix) with ESMTP id AB8BE1380174 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:46 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-07.internal (MEProxy); Sat, 21 Sep 2024 10:53:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726930426; x= 1727016826; bh=Kc56k18rt3CVc0itDOUXwAK203nw+RFffLnTMKJZEgQ=; b=o LR9Lf1X13SQUipdXsR1P/BZOy+8AWSF7bs7l6N+LYXsreojp8pfX388fA657HczZ N1SPl3N2IIrQuiiy/m/4z8dhIH1bLlj1+eKx9+OBmQLyOig2Wvo634h7MpGACopU QMYHov84YvhrlVp4mIkHJapPOObo7oFVEftJnHF7wVZJrR3OU0I2Jg/8d12u1pmJ ESbY8or5cU+KhvLDxrq3apPnFRmhvVYUxVIcGpgmB6hJMy01dSBebNMjwkYweIU/ APc+xUXuk72PqXrPWxqQjIsbckwCeUUYdYb+xNRyu3HzU8NyCFeW+qvpy4SItl5z 1SpGkRRLsxGh2/bZTfLJA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726930426; x=1727016826; bh=Kc56k18rt3CVc 0itDOUXwAK203nw+RFffLnTMKJZEgQ=; b=nNMkAjoZELoaMluoP8S3rZBwoIovp Kkhgqu1fXS0BF+xQgXpnsX9yxB64Tn/QpQXfIhezKC0WhkwaBP4pruFfV+YdG2cf sgDd1WYVBep+kf2UyzCsZVpRVu6DCNHK10o8cEHTnjol9TecVShTb9HBPgEuH4FX 7jFpykhMRyQ60X94frjfeNpBcDQbe31YmwZTRMxCBUzo4M7VoP5TRLsPtxR0MQrc 4W3lA0chwMECgRp186M8cXmbSsyhDjqSOXWICrb4offO3YQoT3wb6dJzhazU4PBS Frhu1yIY1kdKAkc7CFXTbIaaxQgFNWEs+MBqw881NpMeJRKOlTcGVtSUg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpeellefgffefiefgleetudeliefgjedvteeugffghe fggfeivefhvdevfeeftdeljeenucffohhmrghinhepghhithhlrggsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:45 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v8 4/8] gnu: Add cppgir-for-telegram-desktop. Date: Sat, 21 Sep 2024 22:53:10 +0800 Message-ID: <38f217e7fe26ca0cf6324222a74ce4c6fecfa9f5.1726930328.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher , Vivien Kraus Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/glib.scm (cppgir-for-telegram-desktop): New variable. Change-Id: Ib9ca3bd376f32d13939adabd2c52e1eb24e2ddcb --- gnu/packages/glib.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f695d065b3..75954217be 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1621,3 +1621,22 @@ (define-public cppgir introspection annotations into a set of C++ files defining suitable namespaces, classes and other types that together form a C++ binding.") (license license:expat))) + +;; telegram-desktop requires a more recent version of cppgir +(define-public cppgir-for-telegram-desktop + (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") + (revision "0")) + (package + (inherit cppgir) + (name "cppgir-for-telegram-desktop") + (version (git-version "2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fa9nf4yljfarihaqj5kd98yysrky7q316mh6l5b1rq39ga15k9b"))))))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 10:54:21 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:21 +0000 Received: from localhost ([127.0.0.1]:40156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1V6-0004bF-Qb for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:21 -0400 Received: from fout1-smtp.messagingengine.com ([103.168.172.144]:49965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1V1-0004aP-0F for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:15 -0400 Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfout.phl.internal (Postfix) with ESMTP id 7D4C51380178 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:49 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Sat, 21 Sep 2024 10:53:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726930429; x= 1727016829; bh=4VZSxwnGY/koEx83zW/rTcyIAmjQbDiHKNmiT3D9gCw=; b=o YYGE7PyWGZB+0NTt1ZxFhoSz9/JPrlx+egXhiVGK6mIsGuz/6hdtHQz4UKDBptLW 3EVPVaLDgmB/qOyUGn8pvyzNMGI+F3/CNi084Y2efy14Ltz8f4OpC41rkUmi3O9g znT4euxTuD8SB8unWLdG0Z2rLOj5ifoOVMj60BmXNIYZKs1N2PxLmjVQq9erG7ul QM1MTzUDBKtbnGSQ29jgL03uNj6lDJSpnnki+7Bd7P48/YiwfFEH1IEkHZMDq5/Q MjSNqpis4IrtfK3ieR9uedo9oWLyBsZ2Cm/V5vOmjEbfIRFYXqWjJcZqWP2oRqXM a3BSD3+Z5cKApTASazVfw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726930429; x=1727016829; bh=4VZSxwnGY/koE x83zW/rTcyIAmjQbDiHKNmiT3D9gCw=; b=MxvyXNPAcPu8t549YyoDCaI29PuBo FJ/ZXdSuWGGuDemqVrSLlxbSr3bCPVWsmceRfCWQWFFnnyx6WQtzbUZ44gg+YbsB yJQmzeq3HoUTyWziKUIRl/IUSsHmsVVwAnkR0CbFxuYBzXKJn7cSnUWmIaMOGYMq ZRPembGLhZo0+Ax3PypYEZrt/sFxY9+l7ADtKd/1blvkJ2loNqiP/bCXRfje/sU9 jcTEIpRza3fCr78vQcCvR1OlcbVQ+k3K530HpObEFmhXVfx2h+TcEaKm3TDd1PhO oIuFUqjtQnw0mHHiVWbj8bcBnOADLbReuqSqqik38aZKD5SAbH2+YMgoQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpeeffffftdehteetvdelieehgeehtedvteethefgte eivdetgeegtdejtdduudeludenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhep mhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgtphhtthhopedupdhmoh guvgepshhmthhpohhuthdprhgtphhtthhopeejudekleejseguvggssghughhsrdhgnhhu rdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:48 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v8 5/8] gnu: simdjson: Update to 3.10.1. Date: Sat, 21 Sep 2024 22:53:11 +0800 Message-ID: <63a164e789af25cac72b63f519d9bf49d89361e8.1726930328.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/cpp.scm (simdjson): Update to 3.10.1. Change-Id: I6711077e162bcfbf6702d521fdeec44e3b21f074 --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7d782c7ea6..c805dae825 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2395,7 +2395,7 @@ (define-public python-jsonnet (define-public simdjson (package (name "simdjson") - (version "3.1.0") + (version "3.10.1") (source (origin (method git-fetch) (uri (git-reference @@ -2404,7 +2404,7 @@ (define-public simdjson (file-name (git-file-name name version)) (sha256 (base32 - "0q784bm8xbz3p782dw02cdds6m71wk3acy94vva8krc9g88142ws")))) + "1qv7lvls7x9aw6mlnwfgchbajsxh6qygp09wpkb2w6mjdbidmi0h")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; tests require downloading dependencies -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 10:54:22 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:22 +0000 Received: from localhost ([127.0.0.1]:40160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1V7-0004bI-6v for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:21 -0400 Received: from fout1-smtp.messagingengine.com ([103.168.172.144]:57403) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1V4-0004ae-2e for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:18 -0400 Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfout.phl.internal (Postfix) with ESMTP id 8F951138013A for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:52 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Sat, 21 Sep 2024 10:53:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726930432; x= 1727016832; bh=vDfSucveZIK50iLboYcGc5vUmcjj0CcgMcm/xqh1bqA=; b=a D9L472asxXtDc4sDIysQknNFEfbh6Xg3c5VkqnjNxbJHRIuQTSg5V5FtxSdDOhXh +9DTs12MmQIl9y/jf5H9DsiQzIRryoMC7xBNBF0igUKE/sKNQpNRvswz6rsOoTSf 4OK7SEC1aLB6YCjVmSqt3MNskMLmnf1drK5JTi/020yE/mnvWv6Nwl2/G73N2wxA 0KN+2jWpKpTnO+ES0M930hOLm/LKc0A4L9ezEFKBd9SBH+yzjPhrQrNuOGs16BzQ riiGByerfbjV9/IsglVRISt+Fapg5Od93Rpp8N+mNOM14IQjTe3kkpcZaB6GRKrg /wgGiVrirtWJJkM0kt4JQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726930432; x=1727016832; bh=vDfSucveZIK50 iLboYcGc5vUmcjj0CcgMcm/xqh1bqA=; b=ST1XhWDMNKKDnAQB/+mDzCxK9xD30 KWA+A/JYxW50MAB/9PwoH1BOB9YOH3yG2AZ0gMTGM5xq2xPFXEMXMMibrvfsq5Gg Lp18Sk0MUsCSg31G5douYvxtWT7WvkqrlU4UcFk5CWc8dKKqxk3JSzM+toYFOav3 y6scpa96KytRoN4AzC+/onEhYbEGUhHwoAYaA02d+GMxZ/OXK87ZsLa0QL0vHSgt i7wdJ0Og9JD3LS8yWvqtYgjROggmLtTa2fpdWyIBHAeRRMmpEAKkpZYmi8R9n5Lj 1+Vej3MymolAufUxcW2zA8YhNdSS/EvlLMkab7/v0yuWjVSE6Pjf0B1Hw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpefhjedvfeekkefhheeiveeuueeftdejveejleeute eludelgedtueetfefhudeuvdenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:51 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v8 6/8] gnu: Add cpp-ada-url-parser. Date: Sat, 21 Sep 2024 22:53:12 +0800 Message-ID: <2ae23a993d9f52c8a4fd5ef0aff148fa5ab4e509.1726930328.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/cpp.scm (cpp-ada-url-parser): New variable. Change-Id: I9924bba53ed58bbf306bf073c9724cd7bd6f570a --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 26 ++++ ...ser-find-system-testing-dependencies.patch | 130 ++++++++++++++++++ 3 files changed, 157 insertions(+) create mode 100644 gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch diff --git a/gnu/local.mk b/gnu/local.mk index 802f4be4fe..829c5e166e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1103,6 +1103,7 @@ dist_patch_DATA = \ %D%/packages/patches/cool-retro-term-wctype.patch \ %D%/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch \ %D%/packages/patches/coreutils-gnulib-tests.patch \ + %D%/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch\ %D%/packages/patches/cppcheck-disable-char-signedness-test.patch \ %D%/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch\ %D%/packages/patches/cpulimit-with-glib-2.32.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index c805dae825..92be49967f 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -3284,3 +3284,29 @@ (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 cpp-ada-url-parser + (package + (name "cpp-ada-url-parser") + (version "2.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ada-url/ada.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 "0xvvjlia627ajl966gdxzy2b1j0jiimx7zx8ypmffwx0k6x72qam")) + (patches (search-patches "cpp-ada-url-parser-find-system-testing-dependencies.patch")))) + (build-system cmake-build-system) + (native-inputs + (list cxxopts + fmt + googletest + python + simdjson)) + (home-page "https://github.com/ada-url/ada") + (synopsis "URL parser") + (description "Ada is a fast and spec-compliant URL parser written in C++. +Specification for URL parser can be found from the WHATWG website.") + (license license:gpl3+))) diff --git a/gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch b/gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch new file mode 100644 index 0000000000..b32d162530 --- /dev/null +++ b/gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch @@ -0,0 +1,130 @@ +From 74cac57a3cebe0cfbbc44f46270d5e51986f4881 Mon Sep 17 00:00:00 2001 +From: dan +Date: Sat, 21 Sep 2024 18:49:10 +0800 +Subject: [PATCH] find system testing dependencies. + +--- + CMakeLists.txt | 50 +++++++++----------------------------- + singleheader/amalgamate.py | 2 +- + tools/cli/CMakeLists.txt | 8 ++---- + 3 files changed, 14 insertions(+), 46 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a7ce3796..0903cc31 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,43 +28,23 @@ option(ADA_TESTING "Build tests" ${BUILD_TESTING}) + # errors due to CPM, so this is here to support disabling all the testing + # and tooling for ada if one only wishes to use the ada library. + if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS) +- include(cmake/CPM.cmake) +- # CPM requires git as an implicit dependency +- find_package(Git QUIET) + # We use googletest in the tests +- if(Git_FOUND AND ADA_TESTING) +- CPMAddPackage( +- NAME GTest +- GITHUB_REPOSITORY google/googletest +- VERSION 1.14.0 +- OPTIONS "BUILD_GMOCK OFF" "INSTALL_GTEST OFF" +- ) ++ if(ADA_TESTING) ++ find_package(GTest) + endif() + # We use simdjson in both the benchmarks and tests +- if(Git_FOUND AND (ADA_TESTING OR ADA_BENCHMARKS)) +- CPMAddPackage("gh:simdjson/simdjson@3.9.1") ++ if(ADA_TESTING OR ADA_BENCHMARKS) ++ find_package(simdjson) + endif() + # We use Google Benchmark, but it does not build under several 32-bit systems. +- if(Git_FOUND AND ADA_BENCHMARKS AND (CMAKE_SIZEOF_VOID_P EQUAL 8)) +- CPMAddPackage( +- NAME benchmark +- GITHUB_REPOSITORY google/benchmark +- GIT_TAG f91b6b4 +- OPTIONS "BENCHMARK_ENABLE_TESTING OFF" +- "BENCHMARK_ENABLE_INSTALL OFF" +- "BENCHMARK_ENABLE_WERROR OFF" +- +- ) ++ if(ADA_BENCHMARKS AND (CMAKE_SIZEOF_VOID_P EQUAL 8)) ++ find_package(benchmark) + endif() + + if (ADA_TESTING AND NOT EMSCRIPTEN) +- if(Git_FOUND) +- set(CTEST_TEST_TIMEOUT 5) +- message(STATUS "The tests are enabled.") +- add_subdirectory(tests) +- else() +- message(STATUS "The tests are disabled because git was not found.") +- endif() ++ set(CTEST_TEST_TIMEOUT 5) ++ message(STATUS "The tests are enabled.") ++ add_subdirectory(tests) + else() + if(is_top_project) + message(STATUS "The tests are disabled.") +@@ -72,12 +52,8 @@ if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS) + endif(ADA_TESTING AND NOT EMSCRIPTEN) + + If(ADA_BENCHMARKS AND NOT EMSCRIPTEN) +- if(Git_FOUND) +- message(STATUS "Ada benchmarks enabled.") +- add_subdirectory(benchmarks) +- else() +- message(STATUS "The benchmarks are disabled because git was not found.") +- endif() ++ message(STATUS "Ada benchmarks enabled.") ++ add_subdirectory(benchmarks) + else(ADA_BENCHMARKS AND NOT EMSCRIPTEN) + if(is_top_project) + message(STATUS "Ada benchmarks disabled. Set ADA_BENCHMARKS=ON to enable them.") +@@ -107,11 +83,7 @@ if(NOT ADA_COVERAGE AND NOT EMSCRIPTEN) + endif() + + if(ADA_TOOLS) +- if(Git_FOUND) + add_subdirectory(tools) +- else() +- message(STATUS "The tools are disabled because git was not found.") +- endif() + endif() + + install( +diff --git a/singleheader/amalgamate.py b/singleheader/amalgamate.py +index 52b154b6..94e4e638 100755 +--- a/singleheader/amalgamate.py ++++ b/singleheader/amalgamate.py +@@ -138,7 +138,7 @@ if SCRIPTPATH != AMALGAMATE_OUTPUT_PATH: + + shutil.copy2(os.path.join(AMALGAMATE_INCLUDE_PATH, 'ada_c.h'), AMALGAMATE_OUTPUT_PATH) + +-zf = zipfile.ZipFile(os.path.join(AMALGAMATE_OUTPUT_PATH, 'singleheader.zip'), 'w', zipfile.ZIP_DEFLATED) ++zf = zipfile.ZipFile(os.path.join(AMALGAMATE_OUTPUT_PATH, 'singleheader.zip'), 'w', zipfile.ZIP_DEFLATED, strict_timestamps=False) + zf.write(os.path.join(AMALGAMATE_OUTPUT_PATH, 'ada.cpp'), 'ada.cpp') + zf.write(os.path.join(AMALGAMATE_OUTPUT_PATH, 'ada.h'), 'ada.h') + zf.write(os.path.join(AMALGAMATE_INCLUDE_PATH, 'ada_c.h'), 'ada_c.h') +diff --git a/tools/cli/CMakeLists.txt b/tools/cli/CMakeLists.txt +index 9f0da167..d0f7e0c9 100644 +--- a/tools/cli/CMakeLists.txt ++++ b/tools/cli/CMakeLists.txt +@@ -8,12 +8,8 @@ if(MSVC AND BUILD_SHARED_LIBS) + "$" # <--this is in-file + "$") # <--this is out-file path + endif() +-CPMAddPackage("gh:fmtlib/fmt#10.2.1") +-CPMAddPackage( +- GITHUB_REPOSITORY jarro2783/cxxopts +- VERSION 3.2.0 +- OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES" +-) ++find_package(fmt) ++find_package(cxxopts) + target_link_libraries(adaparse PRIVATE cxxopts::cxxopts fmt::fmt) + + if(MSVC OR MINGW) +-- +2.45.2 + -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 10:54:28 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:28 +0000 Received: from localhost ([127.0.0.1]:40164 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1VE-0004bp-1e for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:28 -0400 Received: from fout1-smtp.messagingengine.com ([103.168.172.144]:55401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1V7-0004b3-0C for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:21 -0400 Received: from phl-compute-09.internal (phl-compute-09.phl.internal [10.202.2.49]) by mailfout.phl.internal (Postfix) with ESMTP id 7D54F1380174 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:55 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-09.internal (MEProxy); Sat, 21 Sep 2024 10:53:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726930435; x= 1727016835; bh=CGfP3BtmV5YLyvohOIZZ0SMwXg32uckWwX0jKdo3zCs=; b=h T7VOSjKu/NsxooPTBQD/UXeT33Bgma+S4LHSsdOkzawex3ZE7JIDWp5yq26TQ/8r 6LSSPiXPQhJee9SB4/AOAnjHHu3aRy4Si2A1dgQjFo7hzdfCKhZmM+nEUvhRfQi1 QsvQvZmtmIHcvTF3ofA6lwS2d0AB68qEfeh0Cg99tlAQKHCngiyYKKMEyjv7my1W Ev03YbFuBrziDAVdrHcFaTzRWXancpVINT5ve0jGQnTSeuyqMgDR5s//30HYwxZv 0PouNxdnwETashbs1kHzAtEqPtEckGz0tqbiPUowW3G6peeDgIeFncWSWEYMabvP otDlSMfOiTcc5+32Bh2gQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726930435; x=1727016835; bh=CGfP3BtmV5YLy vohOIZZ0SMwXg32uckWwX0jKdo3zCs=; b=UXQeSQCnl7DvgHq2DzTX+yMcpZbaa eiF25+5sDq+856be+hyYHvfSFmJYJpKYP79BI8Yxk0+tyfSxBqicETU/tcEe7iMS qAJz4TA/7pNXq3uJOP6b41lffxJa37V1SMYR+lUEHdX+1BMZPpOU96mTbebam7eN KASpkEkmTNo/PaYfU7noqHYxnsIkomnVKZgb9pnqpnE7ISjZkRrgbCx6TgxLAgwx BbomZeHjjhEtVcLG3UiSNbZy/plXiGc0YeZWPWbQxVYUOB5dyNe60FVnTKMeTnbV S91CcEfi3brduKjakCYgLrO1c5IlUN+CVmoGvbt3uQEC/vaN0xhY25UCQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpefhjedvfeekkefhheeiveeuueeftdejveejleeute eludelgedtueetfefhudeuvdenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:54 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v8 7/8] gnu: Add libprisma-for-telegram-desktop. Date: Sat, 21 Sep 2024 22:53:13 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/telegram.scm (libprisma-for-telegram-desktop): New variable. Change-Id: I855b463993654a8cad491c7b56c9581b3083f5e4 --- gnu/packages/telegram.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 432d6f79a1..af16d4840b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -400,6 +400,18 @@ (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 "23b0d70f9709da9b38561d5706891a134d18df76"))) + (file-name + (git-file-name "libprisma-for-telegram-desktop" "5.3.2")) + (sha256 + (base32 + "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) + (define-public telegram-desktop (package (name "telegram-desktop") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 10:54:30 2024 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:30 +0000 Received: from localhost ([127.0.0.1]:40166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1VE-0004br-Iy for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:29 -0400 Received: from fhigh6-smtp.messagingengine.com ([103.168.172.157]:60337) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1VA-0004bC-EE for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:26 -0400 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.phl.internal (Postfix) with ESMTP id E8B211140162 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:58 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Sat, 21 Sep 2024 10:53:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1726930438; x=1727016838; bh=YRauKMNqRtr8ILdRS58coftvZLPwaqx9eYHxeGjjTYI=; b= ZWeM8vXZWoU5Y3g57qhzLOK2Is2SnxNWVfU5QOjg3QV9PMW76VLnAhZ5cwzej8oj CwfpzkJy8C4DnEwKvh6q6gI0TKeDQ80dVW88w6crZW9aPCHcMtUzYQO6eAir8pNu wyOEjnS5cnP4xD2TFBXUBI0R7yAYu+7br/B7b9MPF92ttlDIbVs63ikIBCaoiAcJ uUUiw/PYuTaj1ndVr3ktibwKhcu+rSM30hr1zWuuEzzv85sKbtqEHWPrq5bmljAV jRmejsBlquIvXqIr5eEwlml4u3AnhI7FbLJ89ie2Xh2nwtkHncpLrMDWJaZphRCP vb32hXzUIYLQht2eVcquIQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1726930438; x= 1727016838; bh=YRauKMNqRtr8ILdRS58coftvZLPwaqx9eYHxeGjjTYI=; b=l WOeKVmcutMCIBJuIk6HLwG7cVbi5c+AfTD9gLpWgWHPs+AZoYyVy2TpD6qIKrnnW Cj9VwfGPBsO92hL60l8rtTVFgk4sz+R9KSsB5WHWSBSEqccg9G7jLcI4eySGszSp KK2/mSglvDOJtu4Ba5SAG1kGUC1iP8s1JORAxtOx5R90Z+7k2tgU2yK8jUmdbvz6 Zw8ar8atDnWSza6Coz79aDpBHCssoHBpgJVfDfgtwFNHb1cH7oLgZtYvoBc2xQOv jkoLRFn0kN+Ii3Of1xhYIvpV0AUpZbmdpg9dfXoWOlgUumvGCOJniHlLP7bAHlJ3 aUTYbD/84LYHEYvLiTY1w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucgfrhhlucfvnfffucdlud dvmdenucfjughrpefhvffufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpegu rghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghrnhepieekuedvtdevle egheduheelheetfffhhfffhfdvveegveekhefhffeiueeigeeinecuffhomhgrihhnpehg ihhthhhusgdrtghomhdpkhhithifrghrvgdrtghomhenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgt phhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejudekleejseguvg gssghughhsrdhgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:57 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v8 8/8] gnu: telegram-desktop: Update to 5.5.5. Date: Sat, 21 Sep 2024 22:53:14 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: Update patch file to match upstream changes. * gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch: Update patch file to match upstream changes. * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/telegram.scm: (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)[origin]: Add patches to unbundle gsl and cppgir. (libprisma-for-telegram-desktop): Use %telegram-version. (telegram-desktop): Update to 5.5.5. [:configure-flags]: Add disable jemalloc flag. [#:phases]: Add libprisma-for-telegram-desktop. : New phase. : New phase. : New phase. [native-inputs]: Add cpp-ada-url-parser, gobject-introspection and xdg-desktop-portal. [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite and remove jemalloc. Change-Id: I0ea3ea5a3e416a9d5b2b5b7b55ca1af679bc3d38 --- gnu/local.mk | 2 + ...gram-desktop-allow-disable-libtgvoip.patch | 6 +- .../telegram-desktop-unbundle-cppgir.patch | 95 +++++++++++++++ .../telegram-desktop-unbundle-gsl.patch | 31 +++++ ...or-telegram-desktop-unbundle-libsrtp.patch | 7 +- gnu/packages/telegram.scm | 112 +++++++++++------- 6 files changed, 205 insertions(+), 48 deletions(-) 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 829c5e166e..623da8c3ff 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2197,6 +2197,8 @@ 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-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-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch index a603bc9d72..1354a1e9cd 100644 --- a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -47,10 +47,9 @@ diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/ca index 5fe9ac677..bebf48e70 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp -@@ -39,8 +39,10 @@ class InstanceImpl; +@@ -39,7 +39,9 @@ class InstanceImpl; class InstanceV2Impl; class InstanceV2ReferenceImpl; - class InstanceV2_4_0_0Impl; +#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP class InstanceImplLegacy; void SetLegacyGlobalServerConfig(const std::string &serverConfig); @@ -58,10 +57,9 @@ index 5fe9ac677..bebf48e70 100644 } // namespace tgcalls namespace Calls { -@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register(); +@@ -56,6 +58,8 @@ const auto Register = tgcalls::Register(); const auto RegisterV2 = tgcalls::Register(); const auto RegV2Ref = tgcalls::Register(); - const auto RegisterV240 = tgcalls::Register(); +#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP const auto RegisterLegacy = tgcalls::Register(); +#endif 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..a24dbe25bb --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch @@ -0,0 +1,95 @@ +From a5c42e07ae223d440ff11347e0cf1fd58fd383df Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 1/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/CMakeLists.txt | 4 +++- + external/glib/generate_cppgir.cmake | 7 ++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt +index 3c6fe4be..c862705f 100644 +--- a/external/glib/CMakeLists.txt ++++ b/external/glib/CMakeLists.txt +@@ -13,9 +13,11 @@ function(add_cppgir) # isolate scope + set(BUILD_EXAMPLES OFF) + add_subdirectory(cppgir EXCLUDE_FROM_ALL) + endfunction() +-add_cppgir() + + include(generate_cppgir.cmake) ++if (NOT CppGir_FOUND) ++ add_cppgir() ++endif() + generate_cppgir(external_glib Gio-2.0) + + find_package(PkgConfig REQUIRED) +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index c15d3f9e..9b0a5ac8 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 2.0) ++ + function(generate_cppgir target_name gir) + set(cppgir_loc ${cmake_helpers_loc}/external/glib/cppgir) + +@@ -17,6 +19,9 @@ function(generate_cppgir target_name gir) + ${cppgir_loc}/data/cppgir.ignore + ${cppgir_loc}/data/cppgir_unix.ignore + ) ++ if (CppGir_FOUND) ++ set(ignore_files) # rely on default ignore list ++ endif() + + set(gir_path) + if (IS_ABSOLUTE "${gir}") +@@ -33,7 +38,7 @@ function(generate_cppgir target_name gir) + --class + --class-full + --expected +- --ignore ++ "$<$:--ignore>" + "$" + --output + ${gen_dst} + +From eed39522952c15f448c54290454806dd011c4996 Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 2/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/generate_cppgir.cmake | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index 9b0a5ac8..2ad82277 100644 +--- a/external/glib/generate_cppgir.cmake ++++ b/external/glib/generate_cppgir.cmake +@@ -15,11 +15,12 @@ function(generate_cppgir target_name gir) + + set(gen_timestamp ${gen_dst}/${target_name}_cppgir.timestamp) + +- set(ignore_files +- ${cppgir_loc}/data/cppgir.ignore +- ${cppgir_loc}/data/cppgir_unix.ignore +- ) +- if (CppGir_FOUND) ++ if (NOT CppGir_FOUND) ++ set(ignore_files ++ ${cppgir_loc}/data/cppgir.ignore ++ ${cppgir_loc}/data/cppgir_unix.ignore ++ ) ++ else() + set(ignore_files) # rely on default ignore list + endif() + 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..f89d326a5c --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch @@ -0,0 +1,31 @@ +From a3ac6df0441b4caca28b1df87febc420e18942ce Mon Sep 17 00:00:00 2001 +From: Zephyr Lykos +Date: Mon, 23 Oct 2023 15:55:24 +0800 +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 8eaf19c5..344f9488 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) diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch index 486f0b1aa5..3317d0a9c1 100644 --- a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch @@ -17,10 +17,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index af7d24c21..66bec8fdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2647,6 +2647,9 @@ if (TG_OWT_USE_PROTOBUF) - list(APPEND export_targets proto) - endif() - +@@ -2647,5 +2647,8 @@ if (APPLE) + libyuv + ) +if (LIBSRTP_FOUND) + target_compile_definitions(tg_owt PRIVATE HAVE_LIBSRTP) +endif() diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index af16d4840b..327fd0d2b3 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2023 Lu Hui ;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; Copyright © 2024 Ricardo Wurmus +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,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) @@ -44,7 +46,6 @@ (define-module (gnu packages telegram) #:use-module (gnu packages gtk) #:use-module (gnu packages hunspell) #:use-module (gnu packages image) - #:use-module (gnu packages jemalloc) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages language) #:use-module (gnu packages libevent) @@ -82,11 +83,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 "5.5.5") (define libyuv-for-telegram-desktop - (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") - (revision "2439")) + (let ((commit "04821d1e7d60845525e8db55c7bcd41ef5be9406") + (revision "2440")) (origin (method git-fetch) (uri (git-reference @@ -97,79 +98,84 @@ (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 "05a7db2e2d2a59ecf42483debca4944d09154b5b"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) + (patches + ;; https://github.com/desktop-app/cmake_helpers/pull/320 + ;; https://github.com/desktop-app/cmake_helpers/pull/305 + (search-patches "telegram-desktop-unbundle-gsl.patch" + "telegram-desktop-unbundle-cppgir.patch")) (sha256 (base32 - "0y96mvzs113zh8bdw1h3i6l0pgwg93rigrday8kfdg4magz686k6")))) + "1gapyk5a8rsl8vigbz0l8h9858f2lkhkd2pjy72zivp0mrq8w0hr")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "1a969faa0afb29d53af03e530775eccdfb8433f1"))) + (commit "0af136124083369073b8fdaf45f0816fd2b10bad"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1xmw8dfm51p5g20rlmzqnr72a14ngyxwq09an8clf1v5s6mmwvak")))) + "057bwn9smrgnyfb1vraf50ihbkhjc4d72msl7vnbqc4h5sg8dav9")))) (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 "547e7f2914d9b5548dd17e70a3a7bf5d6606afc3"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83")))) + "0sgm2prhd4fw89afh62k7i4i7mj60n170kqz50b0mad927zngxvn")))) (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 "c1d6b0273653095b10b4d0f4f7c30b614b690fd5"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "06mzafnjpfr5ih297dh7bxm6bgpg0wy0gv2r2732n5szyrg9sdl6")))) + "1sxn3qccsfbx1289z0fdrb4cggs16a8r75ic6wi81c6lnkrdi3wl")))) (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 (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_qr.git") - (commit "501f4c3502fd872ab4d777df8911bdac32de7c48"))) + (commit "6fdf60461444ba150e13ac36009c0ffce72c4c83"))) (file-name (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) + "1i5n3qvjkf4nv8k75cc0a71xyvpklc4nzg4k2zsfr2pxk0cy7hkw")))) (define lib-rpl-for-telegram-desktop (origin @@ -188,88 +194,88 @@ (define lib-spellcheck-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "ae89fefd239ecc47d4dab7ba29f9e230376a57d3"))) + (commit "e76981e133a1d29f3ceb557f53850a8d822f439a"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "147xbbcza5q4wcdipk5jplajzkc48971kg2s7qv5jlz33sxkw1lq")))) + "0dslsy3d6gmxaj6yv49zjgl2b2mh75j7fpnbynglr02h3m2fdj96")))) (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 "ccdc72548a5065b5991b4e06e610d76bc4f6023e"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) + "0b11ix95dzpkz335q0a6b5yg8qhj33s4fgj9ppl37pszcqq1j3wi")))) (define lib-tl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_tl.git") - (commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa"))) + (commit "237cbeb9d1c637759f89a508c1d854caf16e1984"))) (file-name (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk")))) + "1ji3gypy4yf9knsgylnyz5gc2kii7lls5ymj1rkf0daixdz931cm")))) (define lib-ui-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "37531086ec21a8569deddedb11b402f8a3157b90"))) + (commit "c4e3a08e6fb90a6174c8b592d9eb747dd4d3f9c5"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0")))) + "1lbfy4fbb52lklfwn6kxny3mwl653r4vc80k922kwjfgbcy9c25f")))) (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "b68a95ad4d1ae9a1827671100a7fd76cbe448c3f"))) + (commit "8751e27d50d2f26b5d20673e5ddba38e90953570"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1c8jwdnn26n13yp0rp0l71q6xlxa6wp3cspbm3pnghw964jwgp3z")))) + "0f05pqb83qckghzlhnwqbi9qfi9xw7qsv8jampl4qyaq9q0w9p20")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "f632fc84cbc62ae8abbbd05f81d472757a337c11"))) + (commit "2de655f58dc327e40d5d9df71300a0d0fdb39c9f"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i")))) + "12vrif0685vb068mj5sd7cknav1n66jysp18j21nlp0am9pw7ydj")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "2e2797648aac2588e7fe479c2e8b4455ec65c5e6"))) + (commit "9bf4065ea00cbed5e63cec348457ed13143459d0"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) + "1p563a11w8jrid96xf03dg6j39ciz28n5f4r6g28lxhiphbqzfym")))) (define-public webrtc-for-telegram-desktop - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") - (revision "389")) + (let ((commit "c425281150317753d7bc5182c6572abe20f9a784") + (revision "456")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -285,7 +291,7 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) + (base32 "1fj48iq56awnrckncy1qc3zhdzifl725hbb6an7wg2v3zmagvrwn")) (patches (search-patches ;; https://github.com/desktop-app/tg_owt/pull/123 @@ -407,7 +413,7 @@ (define libprisma-for-telegram-desktop (url "https://github.com/desktop-app/libprisma") (commit "23b0d70f9709da9b38561d5706891a134d18df76"))) (file-name - (git-file-name "libprisma-for-telegram-desktop" "5.3.2")) + (git-file-name "libprisma-for-telegram-desktop" %telegram-version)) (sha256 (base32 "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) @@ -427,7 +433,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) + (base32 "12fdybn085s3i3a8hwi0bmdns7jxvg0k662n04jgffirgsz8n54m")) (patches (search-patches ;; https://github.com/telegramdesktop/tdesktop/pull/24126 @@ -468,7 +474,10 @@ (define-public telegram-desktop "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" - "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON") + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + ;; enabling jemalloc causes SIGSEGV. this probably happened + ;; after upgrading to glibc 2.39. + "-DDESKTOP_APP_DISABLE_JEMALLOC=ON") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'unpack-additional-sources @@ -493,21 +502,45 @@ (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 'unpack-additional-sources 'use-system-xdg-desktop-portal + (lambda _ + (substitute* (list "Telegram/CMakeLists.txt" + "Telegram/lib_base/CMakeLists.txt") + (("\\$\\{third_party_loc\\}/xdg-desktop-portal/data") + (string-append #$(this-package-native-input "xdg-desktop-portal") + "/share/dbus-1/interfaces"))))) + ;; has to remove this constexpr otherwise cannot compile with gcc-final + (add-after 'use-system-xdg-desktop-portal 'patch-libwebview + (lambda _ + (substitute* "Telegram/lib_webview/webview/webview_interface.h" + (("constexpr ") "")))) (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 (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list `(,glib "bin") + (list cpp-ada-url-parser + `(,glib "bin") + gobject-introspection `(,gtk+ "bin") pkg-config - python-wrapper)) + python-wrapper + xdg-desktop-portal)) (inputs (list abseil-cpp-cxxstd17 alsa-lib + boost c++-gsl + cppgir-for-telegram-desktop crc32c + expected-lite fcitx-qt5 fcitx5-qt ffmpeg @@ -516,7 +549,6 @@ (define-public telegram-desktop gtk+ hime hunspell - jemalloc kcoreaddons-5 kimageformats-5 libdispatch -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 23:00:12 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 03:00:13 +0000 Received: from localhost ([127.0.0.1]:40552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssCpY-0001ZZ-Lr for submit@debbugs.gnu.org; Sat, 21 Sep 2024 23:00:12 -0400 Received: from mail-pf1-f180.google.com ([209.85.210.180]:56413) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssCpW-0001YB-Lr for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 23:00:11 -0400 Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-718e3c98b5aso2314774b3a.0 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 19:59:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726973924; x=1727578724; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=iBWzBOJfDEtKZA6IbKN8xOuDDny9L0j+q85GyhnWXsk=; b=kEEb1yALBJt+GJjjz7OwGYG7lLUKVonr8SeRD5DjlSXO6etCu9vGof+xs44g9ZG3XV 4jQynT9jwdIWc72KAx2zBZKWjq3eSh9lHsJPe+eqAo/BdpqnGIPSKq+E+gCMRxAaU3Vj VjP+brNQA82qZF2rEm3oT44ODU7LvL2kG7QsuLSsFz/83dVV8yXXYqpIOU29qjE5Wf8q BkNRvnFBcw/cD7UOVuxdkUDChDeXNwUvDBiLt0mDCduhvSIn9xPm4yuI1o6Xr6STzlc/ OEfMT+8m5uaACWTqcnhs20Z2WQjAymT5lMRjhUKcNdt5qFH1QRdK1Hj2auCFdRVzIqMU OcsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726973924; x=1727578724; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=iBWzBOJfDEtKZA6IbKN8xOuDDny9L0j+q85GyhnWXsk=; b=IqMDQ6lVpTsei4ra8Q8h6h3R6g1tQGq9cJ5LQydZNCAAXQ4+z88nTxIxDg7dlWSgd0 s7ufKz0H7sHD8sU3nHydGJPihsDOo3WtiewbkB9INYiBmOv2LWNDBkPQ8kEQJFtPHVAi 1dYuA7B3CnM1PUa1nkjX1fVFMMqQZV+QIqSlIfTCTO+hE92eMCz4TUTKKmdITIm30R1H LEGjE46Dt6WGAg5bRpIvyvKsj55MpLtpCMsuk/UaiNINtf3WJq5GcIAlS29/ZtVwew6r ElJGbdnbOWa+cAR/K0bNskyOkiDJM7o+xmMvBhJzulqkF9sJ0qz+6RroVJ4OEEaPMjjn LIIA== X-Gm-Message-State: AOJu0YxwwRBRoQFFCPZEZ1SCwYChvYx7sa9heHBg6HA/M75NLWVhVlgI IEpxGoBRtQ1Ft6xxcwPU83jaCOucadcaSOQsxyeGBv7f5cD5Zrl68dBdNQ== X-Google-Smtp-Source: AGHT+IFJuUR57IIj0gaLLYES4pTM+v5gAbUQjpOqrnqb0c33Juz4laQJegysCtwqF5jklzbPC0fyVw== X-Received: by 2002:a05:6a00:3d4c:b0:719:8f48:ff01 with SMTP id d2e1a72fcca58-7199cd62dbcmr10755179b3a.6.1726973923581; Sat, 21 Sep 2024 19:58:43 -0700 (PDT) Received: from hurd ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71944bcae34sm11913658b3a.220.2024.09.21.19.58.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2024 19:58:43 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH v8 5/8] gnu: simdjson: Update to 3.10.1. In-Reply-To: <63a164e789af25cac72b63f519d9bf49d89361e8.1726930328.git.i@dan.games> (dan's message of "Sat, 21 Sep 2024 22:53:11 +0800") References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> <63a164e789af25cac72b63f519d9bf49d89361e8.1726930328.git.i@dan.games> Date: Sun, 22 Sep 2024 11:58:40 +0900 Message-ID: <875xqomm1r.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Sharlatan Hellseher , Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) dan writes: > * gnu/packages/cpp.scm (simdjson): Update to 3.10.1. > > Change-Id: I6711077e162bcfbf6702d521fdeec44e3b21f074 Reviewed-by: Maxim Cournoyer -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 23:05:42 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 03:05:42 +0000 Received: from localhost ([127.0.0.1]:40557 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssCur-0001yM-FK for submit@debbugs.gnu.org; Sat, 21 Sep 2024 23:05:42 -0400 Received: from mail-pf1-f170.google.com ([209.85.210.170]:59625) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssCuo-0001tA-SW for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 23:05:40 -0400 Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-7191fb54147so2462248b3a.2 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 20:05:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726974252; x=1727579052; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2Ij+8B/AGY9UMnnyS+esSoH5lxBHZjxi04+Z4hLRXh8=; b=LA/Wy21354AE1pkE9KI2H5Teh5BhxmH4Tt24DwccoQzR69Bq7p9LQCiqLswybi6Am5 +IpJvTVOiqSXzqxhAur5ACPb2N2jZ2GHFxienTgxku8UJXvCEr0rQUeRY04j9DoqJSdA iCgv5mTsuEGxqj0zxnv1cYDt67o/pRrH4mZLn1R2kDvT4nJq31Qh1rFSuM4gqoZt68Je YvQsfq+IfyV6Q8qY0SXmqcFQgexB5YvIsriYZ1AUCjoBAKa9YW+dCvfbswVOM19EJXxE tyJUrt+M8vCFn7IU/qCtT184zP/0roGUvrBIssjRq1YHEq9Le2nFVFeiAXzll8FiPl7j GGXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726974252; x=1727579052; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2Ij+8B/AGY9UMnnyS+esSoH5lxBHZjxi04+Z4hLRXh8=; b=V5138Sv1ewAWDbdf3+6LKm8cEZ8B1j9cox50nukmP9tCWBXaA2On/XX6H9DXvfdeg7 QkwplaXIWRUecm33/+ybeij5OAp2iVnRUxz/QjWSuqWaPlvUeQil6g3XNdMLzVYRW/3S Gd42oYagB/IzkhJOSjSVLOqIIcoW8y2oZ7fYy5RJw9CAtkujXdIzimcmEYpsXvB51AzT j5wn5Wk5XxOqnXWeE9EyGgZHF1Yi3uhAk7Tfd8q5/utFBI+7WfVbsl9IWv8HH5O7NAxJ UkOpoz/lgplO5Q52Ff7+DXKJpp7ju1t/6R9ci/vIuC330NFMJX+ObGuv3ZWNusBbiYjG y6rg== X-Gm-Message-State: AOJu0YwCIKvFRcjx/D4XpBKtSNggtXxrqroBNxk9kU0eksLhKUx98QGb WzXmruIIxjtLFILbKZWs/v6L6yG7F/epYIDkquzvMLJNbMV++1En X-Google-Smtp-Source: AGHT+IHbuQe9oGa++6Nix6KJ3I+1GEw20OhkmFk5f2fmYbMjWKCWcSgEMZTLJFzwchFOdcezQd0MtQ== X-Received: by 2002:a05:6a20:21c8:b0:1d3:eb7:2c35 with SMTP id adf61e73a8af0-1d30eb72d46mr9380720637.16.1726974251618; Sat, 21 Sep 2024 20:04:11 -0700 (PDT) Received: from hurd ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71944b9ac28sm12272146b3a.172.2024.09.21.20.04.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2024 20:04:11 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH v8 3/8] gnu: Add cppgir. In-Reply-To: <63bc539416af351630e1008c30c311a62b3c1201.1726930328.git.i@dan.games> (dan's message of "Sat, 21 Sep 2024 22:53:09 +0800") References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> <63bc539416af351630e1008c30c311a62b3c1201.1726930328.git.i@dan.games> Date: Sun, 22 Sep 2024 12:04:08 +0900 Message-ID: <871q1cmlsn.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Vivien Kraus , Sharlatan Hellseher , Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, dan writes: > * gnu/packages/glib.scm (cppgir): New variable. > > Change-Id: Ic4510be6d05b7b3977aa457c6a7fec382c1d3a88 > --- > gnu/packages/glib.scm | 31 ++++++++++++++++++++++++++++++- > 1 file changed, 30 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm > index d6275ea63e..f695d065b3 100644 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -1,5 +1,5 @@ > ;;; GNU Guix --- Functional package management for GNU > -;;; Copyright =C2=A9 2013, 2014, 2015, 2016, 2019, 2020, 2021 Ludovic Co= urt=C3=A8s > +;;; Copyright =C2=A9 2013, 2014, 2015, 2016, 2019, 2020, 2021, 2024 Ludo= vic Court=C3=A8s Is this a mistake? Else I'd expect to see the 'Co-authored-by:' git trailer at the bottom of the commit message. > ;;; Copyright =C2=A9 2013, 2015 Andreas Enge > ;;; Copyright =C2=A9 2013 Nikita Karetnikov > ;;; Copyright =C2=A9 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver > @@ -21,6 +21,7 @@ > ;;; Copyright =C2=A9 2023 Saku Laesvuori > ;;; Copyright =C2=A9 2024 Zheng Junjie <873216071@qq.com> > ;;; Copyright =C2=A9 2024 Remco van 't Veer > +;;; Copyright =C2=A9 2024 dan > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -72,6 +73,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) > @@ -1592,3 +1594,30 @@ (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 "2.0") > + (source > + (origin > + (method git-fetch) > + (uri > + (git-reference > + (url "https://gitlab.com/mnauw/cppgir") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "0cj4myqzb28hgb7zlxlba9y8n4ysxkvv2y9wy6f7ps58mr18h7bl"))= )) > + (build-system cmake-build-system) > + (arguments > + (list > + #:configure-flags > + #~(list "-DINTERNAL_EXPECTED=3DOFF"))) > + (inputs (list boost fmt expected-lite)) > + (home-page "https://gitlab.com/mnauw/cppgir") > + (synopsis "GObject introspection C++ binding wrapper generator") Perhaps 'bindings' plural? Perhaps drop 'wrapper', as it doesn't bring much. It generates C++ bindings to use GOboject introspection, right? I think I'd word it like: "C++ bindings generator for GObject introspection" > + (description "cppgir processes .gir files derived from GObject > +introspection annotations into a set of C++ files defining suitable > +namespaces, classes and other types that together form a C++ binding.") > + (license license:expat))) Is 'guix lint' happy with the above? I remember it used to complained when the first character of the description wasn't capitalized. You could use @file{.gir} for extra decoration. Otherwise, LGTM. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 23:06:16 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 03:06:16 +0000 Received: from localhost ([127.0.0.1]:40561 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssCvQ-0001zh-4h for submit@debbugs.gnu.org; Sat, 21 Sep 2024 23:06:16 -0400 Received: from mail-pf1-f182.google.com ([209.85.210.182]:61509) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssCvO-0001zS-T4 for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 23:06:15 -0400 Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-7198de684a7so2524711b3a.2 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 20:05:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726974288; x=1727579088; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=4+vcOU7Bm1xoMtWnibrmKEltPqm3rpARfW8WkNgPwkg=; b=X+vytsEbrYMWa/OZ0kzD+tvNCIDgPjsm8HFdY6qITu8Y0ELdckrTjX2e2puJi4LotV u+R+936G90qG/XSUJBraf76ROOw53kTuAv3Ywx4ZvO+8tT3/5j9Hmgg8M7nSbnvZjcOb yjZIhWGfU7hrE6WYlznjzNKDKatNw3NAkGrbJdi7ZlMS4aOYYkkpx++zcBxOvaime1jR XxGYU8EpqueHTi77G99k2x8Y/WcppDdwB0YreFxX04UOh+xaXotJc0o70v8SF1+h5UId EMqnJnyHq6tLglEqoK6twF71OyrLQL073EaTu5qnvQpx/Pux/J+f2X/a5nlYybRBH/Zb /oBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726974288; x=1727579088; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4+vcOU7Bm1xoMtWnibrmKEltPqm3rpARfW8WkNgPwkg=; b=S6MCsEb/lJP65ngSnheCKM+WqNMJz8gqKJx6H/RYNOv3+DuMGDiyABpeIB1rhXWKQF VXXpQbqrrmSUWzP63oiNUdaVWymEU3EvyhBq5rREi1WAuSBf5xR8yLz0Du3WZrqF3GY0 0uF8HyV8Wyq5SG9PN3KEvlwa8iolBcIgyPnbepj7zIWdmzUnHCxVCCIAwSCr0z8iMdNX dQo46zz6+HhijinuCXOGzxHSG3OhUMnzOk8hGk27ELvKHLt8sMGd+nIlJ4Fya2DXJ1zi gtxLr5nOhzAzFGoBekQDbRB92XAcklTRRP1nZNOxb0LWG3tyLCzt0i76V6MLXM5txSV4 Cwxg== X-Gm-Message-State: AOJu0Yz8rZLOVI/S+LFkc5rCvYdczDIV24VuV0+dAz5N473plMvTxFzi 4QUfY1FAtwLUB/grkNCNIXARlBpRAp/oPLThEUimvHu2bWKIb1SwIR3+Tw== X-Google-Smtp-Source: AGHT+IH+aXF5r0Aa+eli8y8sbWPC1YHCsXamZVGC865dVEqvr81/F0+RmuA/9R1TZ8Smdm0CHE/H1g== X-Received: by 2002:a05:6a00:1704:b0:718:dd89:a1db with SMTP id d2e1a72fcca58-7199cebe226mr11511637b3a.28.1726974288127; Sat, 21 Sep 2024 20:04:48 -0700 (PDT) Received: from hurd ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71944a980b4sm11914565b3a.34.2024.09.21.20.04.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2024 20:04:46 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH v8 7/8] gnu: Add libprisma-for-telegram-desktop. In-Reply-To: (dan's message of "Sat, 21 Sep 2024 22:53:13 +0800") References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> Date: Sun, 22 Sep 2024 12:04:42 +0900 Message-ID: <87wmj4l779.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Sharlatan Hellseher , Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) dan writes: > * gnu/packages/telegram.scm (libprisma-for-telegram-desktop): New variable. > > Change-Id: I855b463993654a8cad491c7b56c9581b3083f5e4 Reviewed-by: Maxim Cournoyer -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 23:15:23 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 03:15:24 +0000 Received: from localhost ([127.0.0.1]:40565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssD4F-0002MN-5e for submit@debbugs.gnu.org; Sat, 21 Sep 2024 23:15:23 -0400 Received: from mail-pl1-f182.google.com ([209.85.214.182]:50636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssD4C-0002M5-Ov for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 23:15:21 -0400 Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2068acc8a4fso30707885ad.1 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 20:14:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726974834; x=1727579634; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=/LRGaweK2WTADYjLzd+RqOdpAl051vAniIDd4d0EzZg=; b=I/l68Z3Aypzh0m06xcuztyj9Zj4isTfVzso3vY2YqMqnpaczApc46CbUGPxY65C9Un BSiv7DD1qm6qV1Xzjuiwuc8Hcba+390/6TBm2npfZ7KOjHkCC++SUE3Ko4ghxDw7vATf cH61cae9ZQRR6w0na7WlWDM2NvgJoKO7RHBom+SxujlDLuOtaeJ2OsgiHyQQe2+YYCl3 n8xJBsmeY5wDTLinH0I3fsSDLQfMzq5YcWi4F+/wE8fse7V76KQQCu8mV/sMBSKG7yoQ jlU3KKwjL2wpoyhItu/5OrWP3A+lSw6b4mLJkYE4qY0mzi21yvv8KaDd7obtGqK/g7uQ 5VYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726974834; x=1727579634; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/LRGaweK2WTADYjLzd+RqOdpAl051vAniIDd4d0EzZg=; b=N6hE4nBOgD++jMSDryNDW1lxN39FKEv+gyyzpG0n3CFC/PjJIMiefyx1Njz3oFEJqS fg9nVNCnA4/o0XoLBKrgs8wUgL7Z7g+JHvs5cFk7Q4l00GCjVTJSATJ2LfYJ8UpJxnsG he9AAeB5ikJr5ve70DEpmi52hrBojxuma2M5P7VapkOji9l0CnP2qN4Ny7DwAXEVtZOq oC11ErETe3tb2Qt2C1VJSoPcE+7x0non8JnSXr/auaV+3qrlTqx72lo8CWrfXWdLfIbx JgQD0eBEzhB716iVV6JjM7TOXTEUMRxufywFWTVm4vShFGDKqpvd4ldsDf8sRkx9kGxv AYOQ== X-Gm-Message-State: AOJu0Yz02Be6hZv4CU/jlJd85/vFhDhUNHtV0av1YvZ7dxpUP8B8D8sD qNT8des2DiZyO+QnormuQ0H0AT8VvtaKffkQilhY7JKWMoTPIFLg X-Google-Smtp-Source: AGHT+IFkyUuYtJVkw9z3x94J6QwwRAEam2M0k9EMHHBFjN9iTZ85EZ3I08O/PHqvSVPgDT6jfe67mA== X-Received: by 2002:a17:902:f70d:b0:205:6114:9628 with SMTP id d9443c01a7336-208d8322453mr137624425ad.7.1726974833653; Sat, 21 Sep 2024 20:13:53 -0700 (PDT) Received: from hurd ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2079472e15esm114406785ad.244.2024.09.21.20.13.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2024 20:13:53 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH v8 6/8] gnu: Add cpp-ada-url-parser. In-Reply-To: <2ae23a993d9f52c8a4fd5ef0aff148fa5ab4e509.1726930328.git.i@dan.games> (dan's message of "Sat, 21 Sep 2024 22:53:12 +0800") References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> <2ae23a993d9f52c8a4fd5ef0aff148fa5ab4e509.1726930328.git.i@dan.games> Date: Sun, 22 Sep 2024 12:13:50 +0900 Message-ID: <87setsl6s1.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Sharlatan Hellseher , Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Dan, dan writes: > * > gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch: > New file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/packages/cpp.scm (cpp-ada-url-parser): New variable. > > Change-Id: I9924bba53ed58bbf306bf073c9724cd7bd6f570a > --- > gnu/local.mk | 1 + > gnu/packages/cpp.scm | 26 ++++ > ...ser-find-system-testing-dependencies.patch | 130 ++++++++++++++++++ > 3 files changed, 157 insertions(+) > create mode 100644 gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 802f4be4fe..829c5e166e 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1103,6 +1103,7 @@ dist_patch_DATA = \ > %D%/packages/patches/cool-retro-term-wctype.patch \ > %D%/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch \ > %D%/packages/patches/coreutils-gnulib-tests.patch \ > + %D%/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch\ > %D%/packages/patches/cppcheck-disable-char-signedness-test.patch \ > %D%/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch\ > %D%/packages/patches/cpulimit-with-glib-2.32.patch \ > diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm > index c805dae825..92be49967f 100644 > --- a/gnu/packages/cpp.scm > +++ b/gnu/packages/cpp.scm > @@ -3284,3 +3284,29 @@ (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 cpp-ada-url-parser > + (package > + (name "cpp-ada-url-parser") I wasn't sure about the naming, since it doesn't match with the upstream repository name convention, but after looking into it, it seems reasonable given their own naming is not explicit enough and there are bindings for various languages. > + (version "2.9.2") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/ada-url/ada.git") I believe 'guix lint' would complain about a URL redirect on the above. '.git' suffices haven't been used in years for GitHub. > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 (base32 "0xvvjlia627ajl966gdxzy2b1j0jiimx7zx8ypmffwx0k6x72qam")) > + (patches (search-patches "cpp-ada-url-parser-find-system-testing-dependencies.patch")))) Too long line; please break it so it fits under 80 chars (that's our convention), although 'guix lint' won't warn until 100 chars. > + (build-system cmake-build-system) > + (native-inputs > + (list cxxopts > + fmt > + googletest > + python > + simdjson)) > + (home-page "https://github.com/ada-url/ada") > + (synopsis "URL parser") > + (description "Ada is a fast and spec-compliant URL parser written in C++. > +Specification for URL parser can be found from the WHATWG website.") > + (license license:gpl3+))) > diff --git a/gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch b/gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch > new file mode 100644 > index 0000000000..b32d162530 > --- /dev/null > +++ b/gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch > @@ -0,0 +1,130 @@ > +From 74cac57a3cebe0cfbbc44f46270d5e51986f4881 Mon Sep 17 00:00:00 2001 > +From: dan > +Date: Sat, 21 Sep 2024 18:49:10 +0800 > +Subject: [PATCH] find system testing dependencies. > + > +--- > + CMakeLists.txt | 50 +++++++++----------------------------- > + singleheader/amalgamate.py | 2 +- > + tools/cli/CMakeLists.txt | 8 ++---- > + 3 files changed, 14 insertions(+), 46 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index a7ce3796..0903cc31 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -28,43 +28,23 @@ option(ADA_TESTING "Build tests" ${BUILD_TESTING}) > + # errors due to CPM, so this is here to support disabling all the testing > + # and tooling for ada if one only wishes to use the ada library. > + if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS) > +- include(cmake/CPM.cmake) > +- # CPM requires git as an implicit dependency > +- find_package(Git QUIET) > + # We use googletest in the tests > +- if(Git_FOUND AND ADA_TESTING) > +- CPMAddPackage( > +- NAME GTest > +- GITHUB_REPOSITORY google/googletest > +- VERSION 1.14.0 > +- OPTIONS "BUILD_GMOCK OFF" "INSTALL_GTEST OFF" > +- ) > ++ if(ADA_TESTING) > ++ find_package(GTest) > + endif() > + # We use simdjson in both the benchmarks and tests > +- if(Git_FOUND AND (ADA_TESTING OR ADA_BENCHMARKS)) > +- CPMAddPackage("gh:simdjson/simdjson@3.9.1") > ++ if(ADA_TESTING OR ADA_BENCHMARKS) > ++ find_package(simdjson) > + endif() > + # We use Google Benchmark, but it does not build under several 32-bit systems. > +- if(Git_FOUND AND ADA_BENCHMARKS AND (CMAKE_SIZEOF_VOID_P EQUAL 8)) > +- CPMAddPackage( > +- NAME benchmark > +- GITHUB_REPOSITORY google/benchmark > +- GIT_TAG f91b6b4 > +- OPTIONS "BENCHMARK_ENABLE_TESTING OFF" > +- "BENCHMARK_ENABLE_INSTALL OFF" > +- "BENCHMARK_ENABLE_WERROR OFF" > +- > +- ) > ++ if(ADA_BENCHMARKS AND (CMAKE_SIZEOF_VOID_P EQUAL 8)) > ++ find_package(benchmark) > + endif() > + > + if (ADA_TESTING AND NOT EMSCRIPTEN) > +- if(Git_FOUND) > +- set(CTEST_TEST_TIMEOUT 5) > +- message(STATUS "The tests are enabled.") > +- add_subdirectory(tests) > +- else() > +- message(STATUS "The tests are disabled because git was not found.") > +- endif() > ++ set(CTEST_TEST_TIMEOUT 5) > ++ message(STATUS "The tests are enabled.") > ++ add_subdirectory(tests) > + else() > + if(is_top_project) > + message(STATUS "The tests are disabled.") > +@@ -72,12 +52,8 @@ if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS) > + endif(ADA_TESTING AND NOT EMSCRIPTEN) > + > + If(ADA_BENCHMARKS AND NOT EMSCRIPTEN) > +- if(Git_FOUND) > +- message(STATUS "Ada benchmarks enabled.") > +- add_subdirectory(benchmarks) > +- else() > +- message(STATUS "The benchmarks are disabled because git was not found.") > +- endif() > ++ message(STATUS "Ada benchmarks enabled.") > ++ add_subdirectory(benchmarks) > + else(ADA_BENCHMARKS AND NOT EMSCRIPTEN) > + if(is_top_project) > + message(STATUS "Ada benchmarks disabled. Set ADA_BENCHMARKS=ON to enable them.") > +@@ -107,11 +83,7 @@ if(NOT ADA_COVERAGE AND NOT EMSCRIPTEN) > + endif() > + > + if(ADA_TOOLS) > +- if(Git_FOUND) > + add_subdirectory(tools) > +- else() > +- message(STATUS "The tools are disabled because git was not found.") > +- endif() > + endif() > + > + install( > +diff --git a/singleheader/amalgamate.py b/singleheader/amalgamate.py > +index 52b154b6..94e4e638 100755 > +--- a/singleheader/amalgamate.py > ++++ b/singleheader/amalgamate.py > +@@ -138,7 +138,7 @@ if SCRIPTPATH != AMALGAMATE_OUTPUT_PATH: > + > + shutil.copy2(os.path.join(AMALGAMATE_INCLUDE_PATH, 'ada_c.h'), AMALGAMATE_OUTPUT_PATH) > + > +-zf = zipfile.ZipFile(os.path.join(AMALGAMATE_OUTPUT_PATH, 'singleheader.zip'), 'w', zipfile.ZIP_DEFLATED) > ++zf = zipfile.ZipFile(os.path.join(AMALGAMATE_OUTPUT_PATH, 'singleheader.zip'), 'w', zipfile.ZIP_DEFLATED, strict_timestamps=False) > + zf.write(os.path.join(AMALGAMATE_OUTPUT_PATH, 'ada.cpp'), 'ada.cpp') > + zf.write(os.path.join(AMALGAMATE_OUTPUT_PATH, 'ada.h'), 'ada.h') > + zf.write(os.path.join(AMALGAMATE_INCLUDE_PATH, 'ada_c.h'), 'ada_c.h') > +diff --git a/tools/cli/CMakeLists.txt b/tools/cli/CMakeLists.txt > +index 9f0da167..d0f7e0c9 100644 > +--- a/tools/cli/CMakeLists.txt > ++++ b/tools/cli/CMakeLists.txt > +@@ -8,12 +8,8 @@ if(MSVC AND BUILD_SHARED_LIBS) > + "$" # <--this is in-file > + "$") # <--this is out-file path > + endif() > +-CPMAddPackage("gh:fmtlib/fmt#10.2.1") > +-CPMAddPackage( > +- GITHUB_REPOSITORY jarro2783/cxxopts > +- VERSION 3.2.0 > +- OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES" > +-) > ++find_package(fmt) > ++find_package(cxxopts) > + target_link_libraries(adaparse PRIVATE cxxopts::cxxopts fmt::fmt) > + > + if(MSVC OR MINGW) > +-- > +2.45.2 > + That's not upstreamable work, so should ideally be marked as such as a patch at the top of the patch file (Upstream-status: N/A or similar). It's a bit sad that this will need ongoing maintenance (careful rebasing when they touch that file). I'd like to see the problem with CPM commented in a bit more details -- wondering if it could be made to work without patching it out, e.g. perhaps some CMake variables can be set to have CPM work offline? -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 23:23:59 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 03:23:59 +0000 Received: from localhost ([127.0.0.1]:40569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssDCY-0002qT-KL for submit@debbugs.gnu.org; Sat, 21 Sep 2024 23:23:59 -0400 Received: from mail-pl1-f170.google.com ([209.85.214.170]:47374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssDCV-0002qG-Si for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 23:23:56 -0400 Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2053a0bd0a6so33104365ad.3 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 20:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726975349; x=1727580149; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=9dRWbWTXZAfJGqFt9vlh+ACaNRx/XpcG7LcmhQgSmVE=; b=IFi91aw9Ms2/MFyYUq/5+OKLzgxeS/jF0qiObVHQYf0IvOAadTH08FvNxBNnQe4cxY 4W0oSDQ5m/yVqt72Ge0AnRQIZEq4ihT+OKUtZMv2tSnfqqeQM8USkLhuz1k+FjTFZzKn LXx9O5zMUyVhTueo3Lr4V8PhHus2ykbwXI30Ifo8H2rhVGgEO7wtkzQrtw2uxNS6QJcg lH3v4royKvanaLSWMK8eEknAXE73G+0SyWPq28+0wLtP3jAeqmmGmPUh0ts6cKE5XDKQ TnDfS5gCtTph/JZ9s4Cgm+ghpmCSuyYDr2/NhqanVWXrDhT0mJxmwPHf9BYsMvfq8GXt h+zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726975349; x=1727580149; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9dRWbWTXZAfJGqFt9vlh+ACaNRx/XpcG7LcmhQgSmVE=; b=WDasaUWkt2iikoB8RDS4VitiOio7GnNgqmUBozcC5YqPAg9u9W8RPQj3kEYL/dye1T b6AflDBN2H+QmJ47I5/QZJABPfro2n2rPwunHvPuqFb7pRpjnbeoI7d8E3oQWSHiUTBa eNN5t4UWg9NT2P4wvcykk9N3GFfLVGSBjhxerJ2x9Ad+RdezkhUCZB9bq+ZCc60yZget mMzaAnAmWRR5Fj93FmGpN89B6Q6fItmCU4h9LlGXMpo2G/o82t4GSgAbJXHvux6WPY8/ HqVtoiL3i5+McL07w4L1eJi6AqJ0xbZrM2ypXbuTlG6ViXTFRvjfgqsG1spaVEE+CoFI tO4g== X-Gm-Message-State: AOJu0Yzy/rZxORUt3Fs6QH7rODf6+/FHpM7i4QREUkPpqONzmt97VpNQ fENiBwDrjP6eR7XvqrbLDYaxziAgRS/hyWphFsaz7thT34vxZ9N+t4f21Q== X-Google-Smtp-Source: AGHT+IFAlmFqh72erxLHUG/0++BMgzV9WJC4dzv/+NqGU0bc6Ep5FkVnJwl2xpI8pjuU3EpEkhWY+w== X-Received: by 2002:a17:902:d492:b0:206:dc3e:6914 with SMTP id d9443c01a7336-208d83b95dbmr95731115ad.36.1726975349055; Sat, 21 Sep 2024 20:22:29 -0700 (PDT) Received: from hurd ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-207946fb724sm114389615ad.200.2024.09.21.20.22.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2024 20:22:28 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH v8 8/8] gnu: telegram-desktop: Update to 5.5.5. In-Reply-To: (dan's message of "Sat, 21 Sep 2024 22:53:14 +0800") References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> Date: Sun, 22 Sep 2024 12:22:26 +0900 Message-ID: <87o74gl6dp.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Sharlatan Hellseher , Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, dan writes: > * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: > Update patch file to match upstream changes. > * > gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch: > Update patch file to match upstream changes. > * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. > * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. I suppose these patches are from upstream? For extra origin tracking, I like to add a URL to the upstream URL they were fetched from, or at least a comment mentioning this is committed but unreleased in the main repo. [...] > (define-public webrtc-for-telegram-desktop > - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") > - (revision "389")) > + (let ((commit "c425281150317753d7bc5182c6572abe20f9a784") > + (revision "456")) > (hidden-package > (package > (name "webrtc-for-telegram-desktop") > @@ -285,7 +291,7 @@ (define-public webrtc-for-telegram-desktop > (file-name > (git-file-name name version)) > (sha256 > - (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) > + (base32 "1fj48iq56awnrckncy1qc3zhdzifl725hbb6an7wg2v3zmagvrwn")) > (patches > (search-patches > ;; https://github.com/desktop-app/tg_owt/pull/123 > @@ -407,7 +413,7 @@ (define libprisma-for-telegram-desktop > (url "https://github.com/desktop-app/libprisma") > (commit "23b0d70f9709da9b38561d5706891a134d18df76"))) > (file-name > - (git-file-name "libprisma-for-telegram-desktop" "5.3.2")) > + (git-file-name "libprisma-for-telegram-desktop" %telegram-version)) > (sha256 > (base32 > "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) > @@ -427,7 +433,7 @@ (define-public telegram-desktop > (file-name > (git-file-name name version)) > (sha256 > - (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) > + (base32 "12fdybn085s3i3a8hwi0bmdns7jxvg0k662n04jgffirgsz8n54m")) > (patches > (search-patches > ;; https://github.com/telegramdesktop/tdesktop/pull/24126 > @@ -468,7 +474,10 @@ (define-public telegram-desktop > "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" > "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" > "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" > - "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON") > + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" > + ;; enabling jemalloc causes SIGSEGV. this probably happened > + ;; after upgrading to glibc 2.39. > + "-DDESKTOP_APP_DISABLE_JEMALLOC=ON") Nitpick: Please use fully punctuated complete sentences for stand alone comments (the ones on their own lines -- inline comments (trailing at the end of line are OK to be incomplete sentence)) > #:phases > #~(modify-phases %standard-phases > (add-after 'unpack 'unpack-additional-sources > @@ -493,21 +502,45 @@ (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 'unpack-additional-sources 'use-system-xdg-desktop-portal > + (lambda _ > + (substitute* (list "Telegram/CMakeLists.txt" > + "Telegram/lib_base/CMakeLists.txt") > + (("\\$\\{third_party_loc\\}/xdg-desktop-portal/data") > + (string-append #$(this-package-native-input "xdg-desktop-portal") > + "/share/dbus-1/interfaces"))))) > + ;; has to remove this constexpr otherwise cannot compile with gcc-final Ditto (same comment as above). > + (add-after 'use-system-xdg-desktop-portal 'patch-libwebview > + (lambda _ > + (substitute* "Telegram/lib_webview/webview/webview_interface.h" > + (("constexpr ") "")))) GCC should know about constexpr; perhaps the wrong C++ standard (can be provided via a CMake flag) is being selected, or alternatively you could provide a newer gcc compiler native inputs? > (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 > (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) > (native-inputs > - (list `(,glib "bin") > + (list cpp-ada-url-parser > + `(,glib "bin") > + gobject-introspection > `(,gtk+ "bin") > pkg-config > - python-wrapper)) > + python-wrapper > + xdg-desktop-portal)) > (inputs > (list abseil-cpp-cxxstd17 > alsa-lib > + boost > c++-gsl > + cppgir-for-telegram-desktop > crc32c > + expected-lite > fcitx-qt5 > fcitx5-qt > ffmpeg > @@ -516,7 +549,6 @@ (define-public telegram-desktop > gtk+ No GTK 4 support yet? > hime > hunspell > - jemalloc > kcoreaddons-5 > kimageformats-5 > libdispatch Thanks for this undertaking. It looks nearly good to go, with my little comments/concerns ideally addressed. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 23:37:59 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 03:37:59 +0000 Received: from localhost ([127.0.0.1]:40600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssDQ7-0003gt-AS for submit@debbugs.gnu.org; Sat, 21 Sep 2024 23:37:59 -0400 Received: from fout1-smtp.messagingengine.com ([103.168.172.144]:58403) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssDQ5-0003gd-2N for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 23:37:58 -0400 Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id 0AD931380274; Sat, 21 Sep 2024 23:37:30 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Sat, 21 Sep 2024 23:37:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1726976250; x=1727062650; bh=G377neRV1T Eqg6XKguohDUurR5WaKYY9LeHn2IJvg8o=; b=ip87nbD7qHMVx3q2JvHLTC5IHE Wdc7sTLF/+kZ1lXE7C94770oSL2tgnEEIVxO4+eRLQTqY67SNaBxxneVTYuw/yJT uwDL7l9sULAO/YQj7D5Il1zBfjWviG3buHd3pLK4fIWexIccpfC/3B+E169u/BEg qowGZxrQW5QXVMv4bLvg5m7Lzrwj27zGB96pxRhWkypKytOgeJGHq1uOb9gFFzgf Hf8tOO393JX/MP/t9Rg4byNAZJlhzCnatYgmuKkzDzwo8eoZAdO29vMv91TkCDdz bJ+VuwGsZH7OHHiaXWPQ1OGvmKQhhQlVA8V1F3mlcA5ugkA93/8BATNEdVJg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1726976250; x=1727062650; bh=G377neRV1TEqg6XKguohDUurR5Wa KYY9LeHn2IJvg8o=; b=mOeIijvFfB1Iz6mBSgGAu0zUt38vuPT5FpS9Kovu+4el oU9VtQr3Vn3wV/ydX7PPf5DFB9o03rrXdz/YgquiHoywdxG+CTfEEw1bLTGWfdNs pSWMuPQ4eJP9DmH0OuBsjHWvRt3TplE9XovwmiJFxOlpOfXYMWWuCCOSb2kUSR57 A0vKWkWPYhf8ViK1eFeXdngxZfrBZ9eRIhysd0GiJL6p+Akxayxfc3boNstCKZQL 0iu86ecJQDNBn/i3GDaGz3cA4nAykC5vp9ajfATcqt1CEzKV8Xy64fVoIusjmaHG HiAZFOlraFgrlLYJG2pigK8qAwJUdfCNPxz+qdonLA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeliedgjeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefujghffffkgggtsehttdertddttddtnecu hfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghrnhepve fhvedvgffhhfdtteeiuddvteegudeuvefgvdffkedvueeuteetffeliefgtdffnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepgedpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepmhgrgihimhdrtghouhhrnhhohigvrhesghhmrghilhdrtghomhdprhgtphhtthhope ejudekleejseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtoheplhhilhhirghn rgdrphhrihhklhgvrhesghhmrghilhdrtghomhdprhgtphhtthhopehshhgrrhhlrghtrg hnuhhssehgmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 21 Sep 2024 23:37:29 -0400 (EDT) From: dan To: Maxim Cournoyer Subject: Re: [bug#71897] [PATCH v8 6/8] gnu: Add cpp-ada-url-parser. In-Reply-To: <87setsl6s1.fsf@gmail.com> (Maxim Cournoyer's message of "Sun, 22 Sep 2024 12:13:50 +0900") References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> <2ae23a993d9f52c8a4fd5ef0aff148fa5ab4e509.1726930328.git.i@dan.games> <87setsl6s1.fsf@gmail.com> Date: Sun, 22 Sep 2024 11:37:24 +0800 Message-ID: <87a5g0740b.fsf@dan.games> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 Cc: Sharlatan Hellseher , Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Maxim, Maxim Cournoyer writes: > That's not upstreamable work, so should ideally be marked as > such as a > patch at the top of the patch file (Upstream-status: N/A or > similar). > It's a bit sad that this will need ongoing maintenance (careful > rebasing > when they touch that file). I'd like to see the problem with > CPM > commented in a bit more details -- wondering if it could be made > to work > without patching it out, e.g. perhaps some CMake variables can > be set to > have CPM work offline? In the previous iteration, I disabled ADA_TESTING and ADA_TOOLS so that no patches are needed. However, Liliana suggest that "we should enable testing, even if we need to patch the cmake files to unvendor inputs". I think we have to make a decision here: we either accept a package with testing disabled, or we need extra work to maintain the patch in the future. I took a brief look at CPM, and it seems possible to fetch dependencies from local directories, but I assume even we go this way we still need to patch their CMakeLists.txt files. What do you think? -- dan From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 21 23:52:13 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 03:52:13 +0000 Received: from localhost ([127.0.0.1]:40605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssDds-0004Sq-Pn for submit@debbugs.gnu.org; Sat, 21 Sep 2024 23:52:13 -0400 Received: from fout1-smtp.messagingengine.com ([103.168.172.144]:34299) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssDdq-0004SZ-3K for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 23:52:10 -0400 Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfout.phl.internal (Postfix) with ESMTP id D58151380226; Sat, 21 Sep 2024 23:51:43 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Sat, 21 Sep 2024 23:51:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1726977103; x=1727063503; bh=IF4ZOEwSEU VL5F08CKhoM70UUCpdKR4LYXaEhI5KTcw=; b=pbLTFYr+MEvXCqRtLfLtdo8WU/ mOQo1GlA1Prb0D9d5y4cFCmiXCU0V47e611FsB03h/bcPlM8K0SWL8sSntUi+uy1 yuyg+XsUIRuenci25KZhMm0dW0GUHrAPTbeYu6yT+oe5kZl6fEZXtnk/tJP/qZn6 Z6MRFJPPx4TTTSlFabj073NVxC3pcg83IBvuzBspY+GYinjM5NZGWS5U0ZFU0j6P +Y9s+rrLDlvc5Rnjo55QqshAdre0qyJnnyCK3oqOBEfzLrUPWS4czQ5ouqEcs6Or nTeEIBjONr10Q3X2bKvMdEEJgZ8WM5jU2LjPYi+lMYWDJGKCzdkte4LpKbWQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1726977103; x=1727063503; bh=IF4ZOEwSEUVL5F08CKhoM70UUCpd KR4LYXaEhI5KTcw=; b=WW6r3o79uvsGy1/JIQJZ8/UGRR7AvYt/G+dj1bS/NZtZ /mBK4jGu829iib6inXyyo/TFINptpiupBn+mbObsw3jmVORomIuJFR8EEDQQkjhc iNhiWsAkGQytemyfivpnmJcBtOC0LllUGNIljfa5bYHocrR1y1k6q31oQMpHxBkb fVJxpfpFmto2I5B8LZayyCkdbvpCidPiPTEIpUUwuMC/A1qFQD6WbeTMdnTt57Zc dN5RwQpwwbmVHJUYo5VAPHdNUKXLWAa8XHXTqu/97b/fC7/j4jXhdHpIV+aDPmXy 8iHI1/0ENSUlmWkxD7sMPXE4/FjRJpfFgHQd2pX2vA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeliedgjeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefujghffffkgggtsehttdertddttddtnecu hfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghrnhepte eiffdvleekhedttdevffelfffghfehleehtdehveetgeekjeeggedvgfeutdetnecuffho mhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepihesuggrnhdrghgrmhgvshdpnhgspghrtghpthhtohepgedpmhho uggvpehsmhhtphhouhhtpdhrtghpthhtohepmhgrgihimhdrtghouhhrnhhohigvrhesgh hmrghilhdrtghomhdprhgtphhtthhopeejudekleejseguvggssghughhsrdhgnhhurdho rhhgpdhrtghpthhtoheplhhilhhirghnrgdrphhrihhklhgvrhesghhmrghilhdrtghomh dprhgtphhtthhopehshhgrrhhlrghtrghnuhhssehgmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 21 Sep 2024 23:51:43 -0400 (EDT) From: dan To: Maxim Cournoyer Subject: Re: [bug#71897] [PATCH v8 8/8] gnu: telegram-desktop: Update to 5.5.5. In-Reply-To: <87o74gl6dp.fsf@gmail.com> (Maxim Cournoyer's message of "Sun, 22 Sep 2024 12:22:26 +0900") References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> <87o74gl6dp.fsf@gmail.com> Date: Sun, 22 Sep 2024 11:51:40 +0800 Message-ID: <87ldzkl50z.fsf@dan.games> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 Cc: Sharlatan Hellseher , Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Maxim Cournoyer writes: >> + (add-after 'use-system-xdg-desktop-portal >> 'patch-libwebview >> + (lambda _ >> + (substitute* >> "Telegram/lib_webview/webview/webview_interface.h" >> + (("constexpr ") "")))) > > GCC should know about constexpr; perhaps the wrong C++ standard > (can be > provided via a CMake flag) is being selected, or alternatively > you could > provide a newer gcc compiler native inputs? Mentioned in a previous cover letter, when trying to build telegram-desktop with a newer version of gcc (I've tried gcc-12, gcc-13 and gcc-14), I ran into an issue which is similar to: https://issues.guix.gnu.org/43579. --8<---------------cut here---------------start------------->8--- /tmp/guix-build-telegram-desktop-5.5.5.drv-0/source/Telegram/lib_base/base/algorithm.cpp:21:47: error: ?FE_ALL_EXCEPT? was not declared in this scope 21 | const auto errors = std::fetestexcept(FE_ALL_EXCEPT); | ^~~~~~~~~~~~~ /tmp/guix-build-telegram-desktop-5.5.5.drv-0/source/Telegram/lib_base/base/algorithm.cpp:28:14: error: ?feclearexcept? is not a member of ?std? 28 | std::feclearexcept(FE_ALL_EXCEPT); | ^~~~~~~~~~~~~ --8<---------------cut here---------------end--------------->8--- -- dan From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 00:10:24 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 04:10:24 +0000 Received: from localhost ([127.0.0.1]:40610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssDvT-0005Lv-RT for submit@debbugs.gnu.org; Sun, 22 Sep 2024 00:10:24 -0400 Received: from fhigh6-smtp.messagingengine.com ([103.168.172.157]:60185) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssDvQ-0005La-M1 for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 00:10:22 -0400 Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfhigh.phl.internal (Postfix) with ESMTP id E56F211402FA; Sun, 22 Sep 2024 00:09:53 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-02.internal (MEProxy); Sun, 22 Sep 2024 00:09:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1726978193; x=1727064593; bh=OOe4ONKpwR MZNHdG5RzpKxuM7492znpt//D0Vu0Mcoo=; b=HzigqbRplu7lRFEtJQ3c06qJTH Y3GZQEPL5keOOKzATn+ciYhsp198LU7s4A6MQOGbmr//0hyV8bJ9U5Y4Jeb0i57+ bIonklpuN8YZVoWkhDOXlQdxYOkAiVvCfoKw7Q5LW0IZS3y9mqftHr5+KW7kz1UA 1zU9YdGnT2hv72KQFzcdR7WVwuQl6RSyicxDh17AdFxGC63/LGa1KylD4CPoPwRv u8fLoXOvXfdp5Gqb+MtMY7cS0a+10WsdEhxh9S2DcM7x+q6L0HQfS7OfHcueIvE6 8kVY1vt7Q5Qn4KL93n11ZoiOWZLBdNiQomqJgTZr50TX+4aKnTiqsTQvvVTA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1726978193; x=1727064593; bh=OOe4ONKpwRMZNHdG5RzpKxuM7492 znpt//D0Vu0Mcoo=; b=gaVIl7yqNiz0kiRXHBHOY7DOaKGfqJfBUkbcykTdDg06 cRFYYRiAA4Z/xskZHSXIvMZLGfKgvGFvGsxFhYQ4DDTJmemEDXrpiKJa09JHYjrK iD6Uy9sI5QXDXgWJWaISznLIMpQVFEsYqk3yQ5O1u/pUCtSUcZXAYHY+k6iHfdwE TZvzviZUgva47WNG7sssFYbPUMJS+ksunhH0x4RFZDzl95GnxYAyhrSg6ZuLx7G+ Wjg2qQ8Q6erzE77Ja4ozf2pycw9yS9JP4B0jtu24fnFffDAzplA8ujZmn0WHKxY2 BJx3p0SyGGqHi+BTi5OQmUEBxVOJ320cI4DAC+EDSg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeliedgkeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefujghffffkgggtsehttdertddttddtnecu hfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghrnhepve fhvedvgffhhfdtteeiuddvteegudeuvefgvdffkedvueeuteetffeliefgtdffnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepgedpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepmhgrgihimhdrtghouhhrnhhohigvrhesghhmrghilhdrtghomhdprhgtphhtthhope ejudekleejseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtoheplhhilhhirghn rgdrphhrihhklhgvrhesghhmrghilhdrtghomhdprhgtphhtthhopehshhgrrhhlrghtrg hnuhhssehgmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 22 Sep 2024 00:09:52 -0400 (EDT) From: dan To: Maxim Cournoyer Subject: Re: [bug#71897] [PATCH v8 8/8] gnu: telegram-desktop: Update to 5.5.5. In-Reply-To: <87o74gl6dp.fsf@gmail.com> (Maxim Cournoyer's message of "Sun, 22 Sep 2024 12:22:26 +0900") References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> <87o74gl6dp.fsf@gmail.com> Date: Sun, 22 Sep 2024 12:09:50 +0800 Message-ID: <87h6a8l46p.fsf@dan.games> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 Cc: Sharlatan Hellseher , Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Maxim, Maxim Cournoyer writes: >> + (add-after 'use-system-xdg-desktop-portal >> 'patch-libwebview >> + (lambda _ >> + (substitute* >> "Telegram/lib_webview/webview/webview_interface.h" >> + (("constexpr ") "")))) > > GCC should know about constexpr; perhaps the wrong C++ standard > (can be > provided via a CMake flag) is being selected, or alternatively > you could > provide a newer gcc compiler native inputs? The original compilation error is: --8<---------------cut here---------------start------------->8--- /tmp/guix-build-telegram-desktop-5.5.5.drv-0/source/Telegram/lib_webview/webview/webview_interface.h:34:38: error: call to non-?constexpr? function ?typename __gnu_cxx::__enable_if::__value, bool>::__type std::operator==(const std::__cxx11::basic_string<_CharT>&, const std::__cxx11::basic_string<_CharT>&) [with _CharT = char; typename __gnu_cxx::__enable_if::__value, bool>::__type = bool]? 34 | friend inline constexpr bool operator==( | ^~~~~~~~ In file included from /gnu/store/86fc8bi3mciljxz7c79jx8zr4wsx7xw8-gcc-11.4.0/include/c++/string:55, from /gnu/store/86fc8bi3mciljxz7c79jx8zr4wsx7xw8-gcc-11.4.0/include/c++/bits/locale_classes.h:40, from /gnu/store/86fc8bi3mciljxz7c79jx8zr4wsx7xw8-gcc-11.4.0/include/c++/bits/ios_base.h:41, from /gnu/store/86fc8bi3mciljxz7c79jx8zr4wsx7xw8-gcc-11.4.0/include/c++/streambuf:41, from /gnu/store/86fc8bi3mciljxz7c79jx8zr4wsx7xw8-gcc-11.4.0/include/c++/bits/streambuf_iterator.h:35, from /gnu/store/86fc8bi3mciljxz7c79jx8zr4wsx7xw8-gcc-11.4.0/include/c++/iterator:66, from /gnu/store/86fc8bi3mciljxz7c79jx8zr4wsx7xw8-gcc-11.4.0/include/c++/bits/ranges_algobase.h:36, from /gnu/store/86fc8bi3mciljxz7c79jx8zr4wsx7xw8-gcc-11.4.0/include/c++/bits/ranges_algo.h:35, from /gnu/store/86fc8bi3mciljxz7c79jx8zr4wsx7xw8-gcc-11.4.0/include/c++/algorithm:64, from /gnu/store/mz9sf8vsp2qksx1vb4fz8mrz4pkypfmc-qtbase-5.15.10/include/qt5/QtCore/qglobal.h:142, from /gnu/store/mz9sf8vsp2qksx1vb4fz8mrz4pkypfmc-qtbase-5.15.10/include/qt5/QtCore/qiterator.h:43, from /gnu/store/mz9sf8vsp2qksx1vb4fz8mrz4pkypfmc-qtbase-5.15.10/include/qt5/QtCore/qmap.h:43, from /gnu/store/mz9sf8vsp2qksx1vb4fz8mrz4pkypfmc-qtbase-5.15.10/include/qt5/QtCore/QMap:1, from /tmp/guix-build-telegram-desktop-5.5.5.drv-0/source/Telegram/lib_base/base/ordered_set.h:9, from /tmp/guix-build-telegram-desktop-5.5.5.drv-0/source/Telegram/lib_base/base/basic_types.h:10, from /tmp/guix-build-telegram-desktop-5.5.5.drv-0/source/Telegram/lib_webview/webview/webview_common.h:9, from /tmp/guix-build-telegram-desktop-5.5.5.drv-0/source/Telegram/lib_webview/webview/webview_interface.h:9, from /tmp/guix-build-telegram-desktop-5.5.5.drv-0/source/Telegram/lib_webview/webview/platform/linux/webview_linux.h:9, from /tmp/guix-build-telegram-desktop-5.5.5.drv-0/source/Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk.h:9, from /tmp/guix-build-telegram-desktop-5.5.5.drv-0/source/Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk.cpp:7: /gnu/store/86fc8bi3mciljxz7c79jx8zr4wsx7xw8-gcc-11.4.0/include/c++/bits/basic_string.h:6234:5: note: ?typename __gnu_cxx::__enable_if::__value, bool>::__type std::operator==(const std::__cxx11::basic_string<_CharT>&, const std::__cxx11::basic_string<_CharT>&) [with _CharT = char; typename __gnu_cxx::__enable_if::__value, bool>::__type = bool]? declared here 6234 | operator==(const basic_string<_CharT>& __lhs, | ^~~~~~~~ --8<---------------cut here---------------end--------------->8--- The problematic code in telegram-desktop is: --8<---------------cut here---------------start------------->8--- struct NavigationHistoryState { std::string url; std::string title; bool canGoBack : 1 = false; bool canGoForward : 1 = false; friend inline constexpr bool operator==( NavigationHistoryState, NavigationHistoryState) = default; }; --8<---------------cut here---------------end--------------->8--- And the code in /gnu/store/86fc8bi3mciljxz7c79jx8zr4wsx7xw8-gcc-11.4.0/include/c++/bits/basic_string.h is: --8<---------------cut here---------------start------------->8--- template inline typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value, bool>::__type operator==(const basic_string<_CharT>& __lhs, const basic_string<_CharT>& __rhs) _GLIBCXX_NOEXCEPT { return (__lhs.size() == __rhs.size() && !std::char_traits<_CharT>::compare(__lhs.data(), __rhs.data(), __lhs.size())); } --8<---------------cut here---------------end--------------->8--- In gcc-12, the code looks like this: --8<---------------cut here---------------start------------->8--- template _GLIBCXX20_CONSTEXPR inline typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value, bool>::__type operator==(const basic_string<_CharT>& __lhs, const basic_string<_CharT>& __rhs) _GLIBCXX_NOEXCEPT { return (__lhs.size() == __rhs.size() && !std::char_traits<_CharT>::compare(__lhs.data(), __rhs.data(), __lhs.size())); } --8<---------------cut here---------------end--------------->8--- Which indeed has the constexpr. But as I explained in previous reply, I failed at using a newer version of gcc. Thus, I think trivially remove the constexpr from telegram-desktop's source is the easiest fix here. -- dan From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 00:15:16 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 04:15:16 +0000 Received: from localhost ([127.0.0.1]:40615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssE0B-0005cP-TW for submit@debbugs.gnu.org; Sun, 22 Sep 2024 00:15:16 -0400 Received: from fhigh6-smtp.messagingengine.com ([103.168.172.157]:56755) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssE0A-0005c8-3O for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 00:15:14 -0400 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.phl.internal (Postfix) with ESMTP id D7DB51140228; Sun, 22 Sep 2024 00:14:47 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-11.internal (MEProxy); Sun, 22 Sep 2024 00:14:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1726978487; x=1727064887; bh=WmqjYn526B Odr0TI5UjmluZy6/biK8tPiPxaH8zUStI=; b=mbeLJ6Kjl1kLLpeZdglnAL8932 q3z0uz7iRGroPLD7/2tKHw3nY/hDytBAhEDDHgdKZopZek4ymHqnqa4GycaHncLk FFa+ufswwmmmS/9CTi2kzXwjdJfJ7tle5HLXBG46xjLgf2YABhjmcddK2bOJpGOv nzAdpSi57A22TR9GCXgxuyp6nGbITn6DNJnuuCYqGEbDzKqwYSH8N6CDN1fRKtid lBYWdBsLfzJzGLD/v/MZPDbXE5GmCLcbQteqFh7Zv0Iml1ziy7HAJpx9VdwWWAvx kftQbcqBRGHuryv34cR5Q0LOyweM1ndJd3k1JpMNTlw4LnxEbusiBR35NXtA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1726978487; x=1727064887; bh=WmqjYn526BOdr0TI5UjmluZy6/bi K8tPiPxaH8zUStI=; b=bh1ltPeugSoRdk/do5nDn94Oe5iJ5XkEpkk3Gx6/IJ8R /Nbu4mPzBx+1yRb/HpGwe4Y86zv9rQEGmf0ub5NGXFwUhesEq6MO7FEdkHP9Fyn0 yFdztypDyC0q2apv0LqGXlAMQbsPjdB4iynS2xjgm3Hkm0V7lBd4Nba30WJVhcov 1j2u7i67kpRHEBrxt05X672S/FUMDj+wlNrMqG5JatvyBa7xviepgPSgt7ZCUPBK WK4GiJNl8QV2qDUhMPDpiTurdsVNxPr/ngGc6pDmej/Kd0EgCasqmFjZmG/tVLd8 UcPuDd65LIs4ZABLA3E9Mx11yuvCWIWp5GlKE2hVfA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeliedgkedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefujghffffkgggtsehttdertddttddtnecu hfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghrnhepud fgvdetteegfffhgfffheelgeeufefgleeuueeijeetfeduheeuteffleeltdejnecuffho mhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrh grmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgtphhtthhopeeg pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehmrgigihhmrdgtohhurhhnohihvg hrsehgmhgrihhlrdgtohhmpdhrtghpthhtohepjedukeeljeesuggvsggsuhhgshdrghhn uhdrohhrghdprhgtphhtthhopehlihhlihgrnhgrrdhprhhikhhlvghrsehgmhgrihhlrd gtohhmpdhrtghpthhtohepshhhrghrlhgrthgrnhhushesghhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 22 Sep 2024 00:14:47 -0400 (EDT) From: dan To: Maxim Cournoyer Subject: Re: [bug#71897] [PATCH v8 8/8] gnu: telegram-desktop: Update to 5.5.5. In-Reply-To: <87o74gl6dp.fsf@gmail.com> (Maxim Cournoyer's message of "Sun, 22 Sep 2024 12:22:26 +0900") References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> <87o74gl6dp.fsf@gmail.com> Date: Sun, 22 Sep 2024 12:14:44 +0800 Message-ID: <87cykwl3yj.fsf@dan.games> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 Cc: Sharlatan Hellseher , Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Maxim Cournoyer writes: > Hi, > > dan writes: > >> * >> gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: >> Update patch file to match upstream changes. >> * >> gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch: >> Update patch file to match upstream changes. >> * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: >> New file. >> * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New >> file. > > I suppose these patches are from upstream? For extra origin > tracking, I > like to add a URL to the upstream URL they were fetched from, or > at > least a comment mentioning this is committed but unreleased in > the main > repo. > > [...] > >> (define-public webrtc-for-telegram-desktop >> - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") >> - (revision "389")) >> + (let ((commit "c425281150317753d7bc5182c6572abe20f9a784") >> + (revision "456")) >> (hidden-package >> (package >> (name "webrtc-for-telegram-desktop") >> @@ -285,7 +291,7 @@ (define-public webrtc-for-telegram-desktop >> (file-name >> (git-file-name name version)) >> (sha256 >> - (base32 >> "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) >> + (base32 >> "1fj48iq56awnrckncy1qc3zhdzifl725hbb6an7wg2v3zmagvrwn")) >> (patches >> (search-patches >> ;; https://github.com/desktop-app/tg_owt/pull/123 >> @@ -407,7 +413,7 @@ (define libprisma-for-telegram-desktop >> (url "https://github.com/desktop-app/libprisma") >> (commit "23b0d70f9709da9b38561d5706891a134d18df76"))) The upstream pull request URLs were added as comments in the package definition. Do you think this is sufficient? Or do you suggest me adding them in the patch file directly, or in the commit message? -- dan From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 02:14:45 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 06:14:45 +0000 Received: from localhost ([127.0.0.1]:40687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssFro-0004BV-Ph for submit@debbugs.gnu.org; Sun, 22 Sep 2024 02:14:45 -0400 Received: from mail-pj1-f48.google.com ([209.85.216.48]:51543) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssFrn-0004BH-Ds for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 02:14:44 -0400 Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2d877dab61fso2311445a91.3 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 23:14:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726985596; x=1727590396; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=L1hhNgYb/ASrqP3VwpKdGAEKW4i2oCMv2GmiSGDkbpM=; b=NwFTsbVamb3+Rwbl4xvKp1tfcOLZbmSKuMgVH/InTb2g4zHdTlQzNMHfBZLEoDFYJS jk911g1U5u9d4chCGXtQhJxzHk/rrTqRySzonkOSGx/HIVaQpXogBRVYZcWomhpg2wjl RP4qSfklod2h/Nc6uGn9ySh6T8GbLDFF0x4CFtLZsv6+j6U0tb2fZKKi8B1gXRnGzl8a FOWMeqxB74TZQmuzeCWeTtBPYMw384Rk2kYNrAb2quZcHFVfttSgAIAIfPSvB9Scnhb1 U+LbGadrAiIkvno2SsHH8czhrhblXxnZHARL7/FFN75vbmu+EAMByjgN0nI31+0pOkAS cJGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726985596; x=1727590396; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=L1hhNgYb/ASrqP3VwpKdGAEKW4i2oCMv2GmiSGDkbpM=; b=jcAP3lMTF2Eb5TCeHQPh0VF4RrVsZ+I/xTSS+De79FgNHN4TMF0qeI72JINsGEaW5J fh83ePYvyLB89llRK9FDBplOd1PsbYeD4fI72A9ox0VsCdfx2KZSgVql0JSoHRiQMFy8 h9EkXB7xcswrQjLsmW7hxL8W+v2XOBPeYwqkhwkjT6Q28hTfyBKP4AkbzCEl8l6jNOva wQpHPXHLNx9wx9uNPeldxGw/h5Cq+Lrx02VEVMl1QbJNLDAV5GEdWEJVkvy8a95U3KVB pAY8b31RfEJO8wRXZ9VlehvuiyghsuVbAUGZ4fWVPpNzc2wOW+JxhTPr6ANwY6iJv0Qv Px8Q== X-Gm-Message-State: AOJu0YwKKTikbdVhzw4GHNwD7GqvdMzyPIoRvYQhGmhyGLNPoACyp+fH 2umuVoZsCdyVZDUNpylgL1AoNhGi2uFZNO7YsYYkiAb9O5uOsFPs X-Google-Smtp-Source: AGHT+IG5EGHy1O4QP0B2S6JCe3jZDmZFB2J6FnmeTjSZK6ZhcBu7o3tJ7/8F9t2kuQD95bLSIm94pA== X-Received: by 2002:a17:90b:3850:b0:2d8:c7fb:340a with SMTP id 98e67ed59e1d1-2dd7f763a79mr9938994a91.38.1726985596415; Sat, 21 Sep 2024 23:13:16 -0700 (PDT) Received: from hurd ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2dd6ef40fe5sm7077200a91.39.2024.09.21.23.13.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2024 23:13:15 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH v8 6/8] gnu: Add cpp-ada-url-parser. In-Reply-To: <87a5g0740b.fsf@dan.games> (dan's message of "Sun, 22 Sep 2024 11:37:24 +0800") References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> <2ae23a993d9f52c8a4fd5ef0aff148fa5ab4e509.1726930328.git.i@dan.games> <87setsl6s1.fsf@gmail.com> <87a5g0740b.fsf@dan.games> Date: Sun, 22 Sep 2024 15:13:11 +0900 Message-ID: <87ed5ckyh4.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Sharlatan Hellseher , Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Dan, dan writes: > Hi Maxim, > > Maxim Cournoyer writes: > >> That's not upstreamable work, so should ideally be marked as such as >> a >> patch at the top of the patch file (Upstream-status: N/A or >> similar). >> It's a bit sad that this will need ongoing maintenance (careful >> rebasing >> when they touch that file). I'd like to see the problem with CPM >> commented in a bit more details -- wondering if it could be made to >> work >> without patching it out, e.g. perhaps some CMake variables can be >> set to >> have CPM work offline? > > In the previous iteration, I disabled ADA_TESTING and ADA_TOOLS so > that no patches are needed. However, Liliana suggest that "we should > enable testing, even if we need to patch the cmake files to unvendor > inputs". I think we have to make a decision here: we either accept a > package with testing disabled, or we need extra work to maintain the > patch in the future. I agree with Liliana. We strive to enable test suites in Guix packages, as this gives us a much easier time detecting breakages early when upgrading dependent packages. My suggestion was to look a little bit deeper in the problem at hand in case to see if it can be configured to work for our needs. If it can't, then your approach is perfectly fine (ideally with a feature request upstream requesting an easier way to run their test suite offline); if it can, we should configure it instead and avoid having to maintain extra patches. > I took a brief look at CPM, and it seems possible to fetch > dependencies from local directories, but I assume even we go this way > we still need to patch their CMakeLists.txt files. There's a relatively new FetchContent module in CMake that perhaps CPM abstracts? If it's using FetchContent, it should be possible to have the build system attempt to use a system-provided library instead of fetching from a submodule and building it from source. See the 'jami' package, for example, which sets '-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS' to have FetchContent do that. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 07:38:49 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 11:38:49 +0000 Received: from localhost ([127.0.0.1]:40951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvQ-0004sF-HW for submit@debbugs.gnu.org; Sun, 22 Sep 2024 07:38:49 -0400 Received: from [103.168.172.149] (port=54153 helo=fout6-smtp.messagingengine.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvL-0004rc-0w for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 07:38:46 -0400 Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfout.phl.internal (Postfix) with ESMTP id A67851380468; Sun, 22 Sep 2024 07:38:08 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Sun, 22 Sep 2024 07:38:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1727005088; x= 1727091488; bh=PjRv13WVoLXsDBl8YiHekQ1g5nLCBIkZ1hYpujGR5v4=; b=b omltPayKj0SsqE+hxbB8y3hoAtqa2aMHa7GUHb9aZ8zlc/mgRt+a9tt1JjXOoWwG 8IMPO3Wb4d94NWUGo++xTHgKf3+UkKlYqpEorhIl20Jawi0IvUhskTqkiRS6q4Em dyumGVcb8xwAPX8XB6Ua5awrEssxYTPcu07/VtRVkyDIn/s5B1kfrVFiYO436GUu 2fFw1+Cy2m/8+BxJsQS0ZsEGpmtv/ewZ16T9GLF5Y/rreDahuFAyYW5wraRMf3Cu 7U+APMApfK1YiWPVpwGLXhUAlE/VEUkZwtQwjBc9XF/ditxzxEG8YPh7aJfhgwFb /+aVOpo+52ZriI7Dy5JGQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727005088; x= 1727091488; bh=PjRv13WVoLXsDBl8YiHekQ1g5nLCBIkZ1hYpujGR5v4=; b=D ybY3u3/Q2PQMqr/80l1jdIGIel5yE+RBEx0eeubeOeLW6bytkenvwWxh86RH6m6b FpbY4kbwW2IMmHrK+3Fu+NcWrQM2Cx75RYJNwNv10OiqRYSbi+GeEg/x79Ydage2 sCfW3V3q5Noz1buxAHfjLPvNgsK6fLNpAHoYkYPd5QWPLcFcz0Vm5yhnFU2wfUeR 91gw6GlDKucuzqLt4vvkz6X4DYjWjMD5S0PEBVcchZ+hVu9RPTSNIDjuO8et2O2v RUjFoM8BKBMH1P+eekCHSGTzz5RBCe+kFtpTOuR4VSOlrKQCDUJQwBzu+X59VAtg PLpCwKDa054XwfPtXVX4Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeljedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredttden ucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgvrhhnpe dtgeekheeggeettdevtedufedtfffhuddtvedtueeugfegtdettddutedtgedtleenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrd hgrghmvghspdhnsggprhgtphhtthhopeefpdhmohguvgepshhmthhpohhuthdprhgtphht thhopeejudekleejseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtoheplhhilh hirghnrgdrphhrihhklhgvrhesghhmrghilhdrtghomhdprhgtphhtthhopehmrgigihhm rdgtohhurhhnohihvghrsehgmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 22 Sep 2024 07:38:06 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v9 2/8] gnu: xdg-desktop-portal: Improve style. Date: Sun, 22 Sep 2024 19:37:03 +0800 Message-ID: <7648e29926885f068cade00966b625e2e0932061.1727004999.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> References: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Liliana Marie Prikler * gnu/packages/freedesktop.scm (xdg-desktop-portal) [inputs]: Move after arguments. Drop labels. [native-inputs]: Move after inputs. Drop labels. Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_SCC_BODY_TEXT_LINE No description available. 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Debbugs-Envelope-To: 71897 Cc: Liliana Marie Prikler , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) From: Liliana Marie Prikler * gnu/packages/freedesktop.scm (xdg-desktop-portal) [inputs]: Move after arguments. Drop labels. [native-inputs]: Move after inputs. Drop labels. Reviewed-by: Maxim Cournoyer --- gnu/packages/freedesktop.scm | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index f00f4b3956..664adf0cb2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3001,26 +3001,6 @@ (define-public xdg-desktop-portal ;; Disable portal tests since they try to use fuse. (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) (build-system meson-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("glib:bin" ,glib "bin") - ("gettext" ,gettext-minimal) - ("python" ,python) - ("python-dbusmock" ,python-dbusmock) - ("python-pytest" ,python-pytest) - ("python-pytest-xdist" ,python-pytest-xdist))) - (inputs - `(("bubblewrap" ,bubblewrap) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) - ("flatpak" ,flatpak) - ("fontconfig" ,fontconfig) - ("json-glib" ,json-glib) - ("libportal" ,libportal) - ("dbus" ,dbus) - ("geoclue" ,geoclue) - ("pipewire" ,pipewire) - ("fuse" ,fuse))) (arguments `(#:configure-flags (list "-Dsystemd=disabled") @@ -3034,6 +3014,26 @@ (define-public xdg-desktop-portal (find-files "po" "\\.po$")))) (add-after 'unpack 'set-home-directory (lambda _ (setenv "HOME" "/tmp")))))) + (inputs + (list bubblewrap + dbus + flatpak + fontconfig + fuse + gdk-pixbuf + geoclue + glib + json-glib + libportal + pipewire)) + (native-inputs + (list gettext-minimal + `(,glib "bin") + pkg-config + python + python-dbusmock + python-pytest + python-pytest-xdist)) (native-search-paths (list (search-path-specification (variable "XDG_DESKTOP_PORTAL_DIR") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 07:38:54 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 11:38:54 +0000 Received: from localhost ([127.0.0.1]:40965 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvV-0004st-Ju for submit@debbugs.gnu.org; Sun, 22 Sep 2024 07:38:54 -0400 Received: from [103.168.172.154] (port=44445 helo=fhigh3-smtp.messagingengine.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvN-0004rX-Ee for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 07:38:47 -0400 Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfhigh.phl.internal (Postfix) with ESMTP id 2197E11401C3; Sun, 22 Sep 2024 07:38:05 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Sun, 22 Sep 2024 07:38:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm3; t=1727005085; x=1727091485; bh=jB hecTmEMOtRYUpKGur6CWc+Yy+LlXKajT9e6+N+EUw=; b=IgLhoWP52+xEzNpU8g FkXBZNMkWxIr3TnFntuKqm+M1dsw7SJrmqdxy/SS/z9rYv6XhkCUkwrSKafgu9tw 6v7RgS9O+OciI0XQm8734L2/W7RHfmoEcKRsuYYnX50O0QjYGjfleIhNv56kS3xR 5fNjqXenVYgz51f1S1a7U8Z/OnkFYgobWA4gU7rwhW+Nv4UvdyANnF5GiXMAIRwJ 0aQVXekpb4hJpFzd2sPb34gNR3g5BGX+OA9heyF++6IRm253AON2gsr4rYyUmfKe bfOsp26XN97KjEQqk1MHeDkI8sNCBvu2LRJ9iCwmqvI9x3cInb0v/nv1DVs0fNRG X8Hw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1727005085; x=1727091485; bh=jBhecTmEMOtRY UpKGur6CWc+Yy+LlXKajT9e6+N+EUw=; b=NMKhvsf8gC5PnJIrFtLpwJb6ioKHN mzSCP62RCQi+yYDlX3tGj1qhG7Ps9xFda29fE0hrXoyAZ7W7qByjIMneu6diKgF6 1vrBu4ELBIoVtc2IzK82Z5xvhQbAi29C00Ilqpu/qi+NPGfHMPGCkV+GviRd4LVh M+grvFAFv1wDb+L5kfJBNvpvziWrOhXwtfUALve0tt653YSzXC+SC9wzzBuWeF2J 0xfG4ns/cQkx4UyGBMiesmr7WBHCmoxI0wTp78M6ZH3529mV+T7YUHGkHOJ6hm8V 8EesFGqojEbKmfGLbynQCH4gcyhPi+pfLlegrBECMmIldCX8YbnLTDNEg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeljedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofggtgfgsehtkeertdertdejnecu hfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghrnhepje efheegveffgefhuedtkeegueevleeiueejgffgjeffvdejleevtdejleelieehnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepfedpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehmrgigih hmrdgtohhurhhnohihvghrsehgmhgrihhlrdgtohhmpdhrtghpthhtoheplhhilhhirghn rgdrphhrihhklhgvrhesghhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 22 Sep 2024 07:38:03 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v9 1/8] gnu: xdg-desktop-portal: Update to 1.18.4. Date: Sun, 22 Sep 2024 19:37:02 +0800 Message-ID: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: 71897 Cc: Liliana Marie Prikler , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.18.4. [patches]: Disable portal tests. [native-inputs]: Remove autoconf, automake, libtool and which. Add python, python-dbusmock, python-pytest and python-pytest-xdist. [inputs]: Add bubblewrap. [arguments]<#:configure-flags>: Replace “--with-systemd=no” with “-Dsystemd=disabled”. Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 25 +++++---- ...-desktop-portal-disable-portal-tests.patch | 56 +++++++++++++++++++ 3 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8e7abc8a47..802f4be4fe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2303,6 +2303,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-dbus-group-policy.patch \ %D%/packages/patches/x265-arm-flags.patch \ + %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xen-docs-use-predictable-ordering.patch \ %D%/packages/patches/xen-remove-config.gz-timestamp.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 993bb84ec6..f00f4b3956 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2024 aurtzy ;;; Copyright © 2024 Dariqq ;;; Copyright © 2024 Wilko Meyer +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -136,6 +137,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages video) + #:use-module (gnu packages virtualization) #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -2986,7 +2988,7 @@ (define-public libportal (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.16.0") + (version "1.18.4") (source (origin (method url-fetch) @@ -2995,18 +2997,21 @@ (define-public xdg-desktop-portal version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav")))) - (build-system gnu-build-system) + "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q")) + ;; Disable portal tests since they try to use fuse. + (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("glib:bin" ,glib "bin") - ("which" ,which) - ("gettext" ,gettext-minimal))) + ("gettext" ,gettext-minimal) + ("python" ,python) + ("python-dbusmock" ,python-dbusmock) + ("python-pytest" ,python-pytest) + ("python-pytest-xdist" ,python-pytest-xdist))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) + `(("bubblewrap" ,bubblewrap) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("flatpak" ,flatpak) ("fontconfig" ,fontconfig) @@ -3018,7 +3023,7 @@ (define-public xdg-desktop-portal ("fuse" ,fuse))) (arguments `(#:configure-flags - (list "--with-systemd=no") + (list "-Dsystemd=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'po-chmod diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch new file mode 100644 index 0000000000..5e13493613 --- /dev/null +++ b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch @@ -0,0 +1,56 @@ +From b7750fa99c31c5f28ac2053fa154bef4038b5cc0 Mon Sep 17 00:00:00 2001 +From: dan +Date: Tue, 2 Jul 2024 19:37:38 +0800 +Subject: [PATCH] tests: remove portal tests. + +--- + tests/meson.build | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index a2dafee..bcd87be 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -181,18 +181,6 @@ portal_tests = [ + + test_env = env_tests + test_env.set('XDG_CURRENT_DESKTOP', 'test') +-foreach p : portal_tests +- test( +- 'test-portals-@0@'.format(p), +- test_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/portal/@0@'.format(p)], +- depends: [test_backends, test_portals], +- env: test_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + # Split the portal tests into one test per portal, this makes debugging a lot + # easier. +@@ -204,18 +192,6 @@ portal_limited = [ + + limited_env = env_tests + limited_env.set('XDG_CURRENT_DESKTOP', 'limited') +-foreach p : portal_limited +- test( +- 'limited-portals-@0@'.format(p), +- limited_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/limited/@0@'.format(p)], +- depends: [test_backends, limited_portals], +- env: limited_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + if enable_installed_tests + install_data( + +base-commit: 11c8a96b147aeae70e3f770313f93b367d53fedd +-- +2.41.0 + base-commit: b7c94d528875415ea7ec6225d88a6b3d55fa2e14 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 07:38:54 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 11:38:55 +0000 Received: from localhost ([127.0.0.1]:40967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvW-0004t5-Ep for submit@debbugs.gnu.org; Sun, 22 Sep 2024 07:38:54 -0400 Received: from fhigh3-smtp.messagingengine.com ([103.168.172.154]:38919) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvP-0004rp-NE for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 07:38:48 -0400 Received: from phl-compute-09.internal (phl-compute-09.phl.internal [10.202.2.49]) by mailfhigh.phl.internal (Postfix) with ESMTP id F16FA114022F for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 07:38:19 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-09.internal (MEProxy); Sun, 22 Sep 2024 07:38:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1727005099; x= 1727091499; bh=dpqyQIXIffz4knBkLU0abN68PUnHDciNfQS3+ga8Fa4=; b=q /GeNex1Ze+QEVeuGvhnf//d4ETw5BQqOldPJ+pBAuE7khJDbrNLHjQdMFwyd0ZUL ZyLsZFmiGl63hjuVecd9FnhZDd+o0nTFzqhsBsh2PpywBcw17KTFZEFJk/01yQ/S n2NjIC40SkYncP0QJw7j7GxuNO+3n8xaB/P+6vmc9LNphNedqjm3KPw2lxGllXfp QN3EbYSZhXPTccXwOXn4jt6jtbIYXZtNxdRl73fQOXdokKc9T4KEhZhN5yOzRYKR fx4nsqYiIY0TY5GSvncL1gyH2BWAxONGhpxEnkuZ4730b0CGQ0Lk2b8QJkPq7LHP 3sL2C+U2MKWxBKwcHUtNw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1727005099; x=1727091499; bh=dpqyQIXIffz4k nBkLU0abN68PUnHDciNfQS3+ga8Fa4=; b=d9gRjTBeXIRkD/5rguXmo6aFrHfJT DIarr9zudCzfm3yZ2Gt2Fz/jcsRSy+lW2jg0jCKSgZjV38iRAXYZMvirHI1H3deT poIQOpl6U8GFPDBxOfrRgXC+42pZDX6/0NyB2CnyjrwIh41DKnbIcSXQJYoWf0ZY 4ORvCJ4b4Gk1HH5YUL9yF9ylRSFMnIySFh+19/RnkVgfLdTJDf7w7ZqYuD9sxjDj ramxk5rNB2gPcwdyV+yPJbE0evuDBve1t8D2BdLgAedjM84DEVcunHCfMsWWV4gR v7J7oY/ooGXau6w+LuFmdLnQTfb/pXb4juH7gtkUiCw2R89wsNhr+Td1Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeljedggeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpefhjedvfeekkefhheeiveeuueeftdejveejleeute eludelgedtueetfefhudeuvdenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 07:38:18 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v9 6/8] gnu: Add cpp-ada-url-parser. Date: Sun, 22 Sep 2024 19:37:07 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> References: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/cpp.scm (cpp-ada-url-parser): New variable. (cpm-for-cpp-ada-url-parser): New variable. Change-Id: I0b61c3b136e2781774c6a5e67eeb6b662e97dd88 --- gnu/packages/cpp.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index c805dae825..29e50d4531 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -3284,3 +3284,61 @@ (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 cpm-for-cpp-ada-url-parser + (let ((version "0.38.6")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cpm-cmake/CPM.cmake") + (commit (string-append "v" version)))) + (file-name (git-file-name "cpm-for-cpp-ada-url-parser" version)) + (sha256 (base32 "1qbbhdq6cz2y7qfyy1k11i98d13s229r3phd5y3n5maq51ky8bgb"))))) + +(define-public cpp-ada-url-parser + (package + (name "cpp-ada-url-parser") + (version "2.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ada-url/ada") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 "0xvvjlia627ajl966gdxzy2b1j0jiimx7zx8ypmffwx0k6x72qam")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DCPM_LOCAL_PACKAGES_ONLY=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-deps + (lambda _ + (substitute* "CMakeLists.txt" + (("cmake/CPM.cmake") + (string-append #$cpm-for-cpp-ada-url-parser "/cmake/CPM.cmake")) + ;; We force CPM to find system packages rather than using git + ;; to download them. + (("Git_FOUND") "TRUE") + (("3.9.1") + #$(package-version (this-package-native-input "simdjson")))) + (substitute* "tools/cli/CMakeLists.txt" + (("3.2.0") + #$(package-version (this-package-native-input "cxxopts")))))) + (add-after 'patch-deps 'python-zipfile-disable-strict-timestamps + (lambda _ + (substitute* "singleheader/amalgamate.py" + (("zipfile.ZIP_DEFLATED") + "zipfile.ZIP_DEFLATED, strict_timestamps=False"))))))) + (native-inputs + (list cxxopts + fmt-10 + googletest + python + simdjson)) + (home-page "https://github.com/ada-url/ada") + (synopsis "URL parser") + (description "Ada is a fast and spec-compliant URL parser written in C++. +Specification for URL parser can be found from the WHATWG website.") + (license license:gpl3+))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 07:39:03 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 11:39:03 +0000 Received: from localhost ([127.0.0.1]:40969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvW-0004t8-Tp for submit@debbugs.gnu.org; Sun, 22 Sep 2024 07:39:02 -0400 Received: from fout6-smtp.messagingengine.com ([103.168.172.149]:33929) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvQ-0004rs-Gg for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 07:38:48 -0400 Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfout.phl.internal (Postfix) with ESMTP id 9D9AF1380469 for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 07:38:14 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Sun, 22 Sep 2024 07:38:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1727005094; x= 1727091494; bh=KayNk14xkBuPFM1yAz9i90vpTdlvLmL/1FOVcEEeJfk=; b=F cYdHSXfSy/u1bpyGaj3nkzXfqH5BFJWO8UC3MaiVeCNvAmACg4CeGk5cqYARBFUK JUBZGfR37vNLlW4APZ1R/WNLPJUPXQw0SN4HF1PtSa2QQl4mYnuP6lyVRwa1lv2b Qc03VL33qDi1b7vBsIGxp2298RwPeCa7or8VKk+2P6s2C85nqNSK9tzCEVTlL85h HCtt5OI0ktChSlZMpZMAOvQbExGbXed9MmFyDHbGt15yssCs0UYgw/WZDeqaU3yQ BDC7tT1wLRYlB72jSpK2F+w3ptmItUqjUrQUv0JfiuyuE9FPP1JFIarvJBGcpUEv lvD56JR4SkJR4S5mzeCTg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1727005094; x=1727091494; bh=KayNk14xkBuPF M1yAz9i90vpTdlvLmL/1FOVcEEeJfk=; b=miL4uSfWez9d9vS1v2jpuGQKOnyz7 CtdH+J70dGKYtCdKvYdADCAm4J9Y24xHRy6nBZyuyhvYqIkIJ5Vt78Hft1rcByMd ePrwra2ECx9ucKwAaCAK5rVBmkyzYRKixmxUM6WaIDju7ZF5xgG2weIw1jyxb0Tc iZt/8wsza8YbYQZa1tHLlL6r4uHoYyxgK22i7JmHarkAsTTBd7QKkqGY354lKrKE Yo1o9nLrHxQ4PtoiZ6Vx+2KK7WQ2t/3hxYBU2AMs3sShEMe/rH3zCXWvhq6Eghab 2MhgXmdJZ02c8Bb8UendQZwUu0z8PjXo6eM72+05i5ewyBV+PtVaJZb1w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeljedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpeellefgffefiefgleetudeliefgjedvteeugffghe fggfeivefhvdevfeeftdeljeenucffohhmrghinhepghhithhlrggsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 07:38:13 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v9 4/8] gnu: Add cppgir-for-telegram-desktop. Date: Sun, 22 Sep 2024 19:37:05 +0800 Message-ID: <547cddd33812def45281f6084f0a5d331d645379.1727004999.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> References: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher , Vivien Kraus Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/glib.scm (cppgir-for-telegram-desktop): New variable. Change-Id: Ib9ca3bd376f32d13939adabd2c52e1eb24e2ddcb --- gnu/packages/glib.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a479199cdd..a15a7ce58a 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1621,3 +1621,22 @@ (define-public cppgir introspection annotations into a set of C++ files defining suitable namespaces, classes and other types that together form a C++ binding.") (license license:expat))) + +;; telegram-desktop requires a more recent version of cppgir +(define-public cppgir-for-telegram-desktop + (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") + (revision "0")) + (package + (inherit cppgir) + (name "cppgir-for-telegram-desktop") + (version (git-version "2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fa9nf4yljfarihaqj5kd98yysrky7q316mh6l5b1rq39ga15k9b"))))))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 07:39:06 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 11:39:06 +0000 Received: from localhost ([127.0.0.1]:40975 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvf-0004tp-11 for submit@debbugs.gnu.org; Sun, 22 Sep 2024 07:39:06 -0400 Received: from fout6-smtp.messagingengine.com ([103.168.172.149]:46057) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvQ-0004rr-65 for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 07:38:49 -0400 Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id AEEBF13802DF for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 07:38:11 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Sun, 22 Sep 2024 07:38:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1727005091; x=1727091491; bh=waTakVTyAItEDFV/nXn/isK6MZK+UiZn2kzLXw80O70=; b= vhHaZzQDIzdxiywcbSWxtwL63CnisWeokXUGKnJUWp6idqVJtUtZSAqw9D/6zQ9h IbY2UFNUBIwOqOJOcAGnrzNEG0oJc/oF7sm7zxoOYVpIRtdglQewjrsLSTKprtve MukNFoaMeC99NmWNJNvXZrEonRSAKg46kX9WbWQfLunheG+n2JtXM26ePDbI2iAx UP6cKIH50RYkabU1SeyfFjM5aicGboRyGAXEv4cXfzszjlhlHEVPTRITy0Ttfyd7 3IwzGPwgmpKWUpdQ8JAHkKY6gLfuokssuraIn3v/5ESxlKU0JaZPkLDA/HJF1JyK z5NYDZMSEwV87DYqAq5RFg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727005091; x= 1727091491; bh=waTakVTyAItEDFV/nXn/isK6MZK+UiZn2kzLXw80O70=; b=I NrkSNQSary+SIf/3rgQ1pYyKQU+fpsHVC2cIs8fZk22txPUulzpmDOJRpEdKMgYA CZhtmijUnxKZblrQWijihOzRrQUWmEWCP87dFVUIsFGxTylM32McxXiawDfp9rv9 WFROzJAbRPEv9fu5AX1tu/wJNBdb+YQEPGLZ6DI3Xv1/bciiXYcM6TvbBbHWZj2I V/pzvWfHsCKvMexVSls/WrD/Gad6206jYJJNZXXg4m2ey2kaBh3y1D1oy/CgpW0I xb/Ns1Eoz3KypX+vDrLXEa2j3G3enW1UlEKuqN2NHLksgmlm0U19xJ/HYIcgFWBm Rdo4zKgdcoGi72x6BTYFQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeljedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgr mhgvsheqnecuggftrfgrthhtvghrnhepgfettddtgfdttdeiffdufeefleegtddutddvve ehkedtieefvdeifeeiffeijeeunecuffhomhgrihhnpehgihhtlhgrsgdrtghomhenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrd hgrghmvghspdhnsggprhgtphhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphht thhopeejudekleejseguvggssghughhsrdhgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 07:38:10 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v9 3/8] gnu: Add cppgir. Date: Sun, 22 Sep 2024 19:37:04 +0800 Message-ID: <6bb8b85392f9a5dd8a6dcbaa9f60e313113fc4b0.1727004999.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> References: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher , Vivien Kraus Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/glib.scm (cppgir): New variable. Change-Id: Ic4510be6d05b7b3977aa457c6a7fec382c1d3a88 --- gnu/packages/glib.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d6275ea63e..a479199cdd 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2023 Saku Laesvuori ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Remco van 't Veer +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -72,6 +73,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) @@ -1592,3 +1594,30 @@ (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 "2.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cj4myqzb28hgb7zlxlba9y8n4ysxkvv2y9wy6f7ps58mr18h7bl")))) + (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 "C++ bindings generator for GObject introspection") + (description "cppgir processes @file{.gir} files derived from GObject +introspection annotations into a set of C++ files defining suitable +namespaces, classes and other types that together form a C++ binding.") + (license license:expat))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 07:39:07 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 11:39:07 +0000 Received: from localhost ([127.0.0.1]:40986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvi-0004uT-If for submit@debbugs.gnu.org; Sun, 22 Sep 2024 07:39:06 -0400 Received: from fhigh3-smtp.messagingengine.com ([103.168.172.154]:39653) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvR-0004rw-4e for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 07:38:49 -0400 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.phl.internal (Postfix) with ESMTP id 78B271140222 for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 07:38:22 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Sun, 22 Sep 2024 07:38:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1727005102; x= 1727091502; bh=CGfP3BtmV5YLyvohOIZZ0SMwXg32uckWwX0jKdo3zCs=; b=w ppQ4QkorIYJ6T+ZKwH6a1fTJmkbOLMLIY7uhU6dHK7IdiLjmOlp633NFcSYMptNy T1tg6jeE0TQSArrr/99vNUM8SNv4YOoDBTdI/89YxUTacWAmGuKOMLMfBWkL4QpJ dv+egtKeKvKAlEt3ZqEoXf89+bNdlqVuFkyRaQRTHwXzqa2mTi92w15MlsAeRBpL tOpHokKqTvpvDfWNIBQxXAtGor2PQE4J2+11ga9Tp6ZEwf4UlP03K1hpcSRZ2L3O ZxameV0GspTs2vpGhAhCu5QMv3dI2gFZVkqq8DhVSXKSoM5DFgfewVkJQAHYAoZ+ zyPbZ6nektFHPi6c/aoIg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1727005102; x=1727091502; bh=CGfP3BtmV5YLy vohOIZZ0SMwXg32uckWwX0jKdo3zCs=; b=irM+FJN+1jj96xHqUuQRy4FwSTZmN PAWg1AdjosEuY5QaQne/M4kzXho5vjsn/rFkPsSye13c8FWR/fNzFvDi36ai6w9G rqZkE9oWBQWO6kOkFFYUmIbXLWxVO72vSPZEVeaFKom7GUCJNE4+jLyt8TQ+SatD qx8zMbpR9XMQHugQOI3q7WoCp44iMFo6IfXNfyYYw5MKMEEqRUqFcARqtSYmLFpn gT3g16B3EtmKJ4+3LJeLkNdN491hY3ij8dehQhQy+FNnyY3e0XRQCCBvCqi4lY6S Z6rV4MoE9SAgNuFUJSDI0Ca9Dgm6Cb/PBoj4jR8W78VdU9v4yjfMXbCaQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeljedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpefhjedvfeekkefhheeiveeuueeftdejveejleeute eludelgedtueetfefhudeuvdenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 07:38:21 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v9 7/8] gnu: Add libprisma-for-telegram-desktop. Date: Sun, 22 Sep 2024 19:37:08 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> References: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/telegram.scm (libprisma-for-telegram-desktop): New variable. Change-Id: I855b463993654a8cad491c7b56c9581b3083f5e4 --- gnu/packages/telegram.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 432d6f79a1..af16d4840b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -400,6 +400,18 @@ (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 "23b0d70f9709da9b38561d5706891a134d18df76"))) + (file-name + (git-file-name "libprisma-for-telegram-desktop" "5.3.2")) + (sha256 + (base32 + "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) + (define-public telegram-desktop (package (name "telegram-desktop") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 07:39:07 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 11:39:07 +0000 Received: from localhost ([127.0.0.1]:40988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvi-0004ua-Vc for submit@debbugs.gnu.org; Sun, 22 Sep 2024 07:39:07 -0400 Received: from fout6-smtp.messagingengine.com ([103.168.172.149]:59197) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvT-0004s1-Ah for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 07:38:51 -0400 Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfout.phl.internal (Postfix) with ESMTP id 6E3FF1380467 for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 07:38:17 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-05.internal (MEProxy); Sun, 22 Sep 2024 07:38:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1727005097; x= 1727091497; bh=4VZSxwnGY/koEx83zW/rTcyIAmjQbDiHKNmiT3D9gCw=; b=V +4WZ3TgtT2qu3j8dei5deOHVza9metmAw+KG1KS+ODKhh/ZCBlO/23EdCP3aTGyy rFzlTaszfUKcGzYsMtpejJmiuIBnKfa++s5D8PzBDbK6pIcZeK+IDC0YGsqWZWUM UpELoJCS6sDYxKYOm4EdUwGkWYAgn0gmMxSW39tf5u5EO+zS3hSiSc/4w0QgmLdM /li9UdjsKIMH5cQElE7vdIOjWLKlUMzEavPNuB4g3EwtdSH/UkmyCcFv3ai+/8wX y7UrRZXzJ5pqZNHxcy8t94GM35/UjZ0ls63VDv26oJLw/e1/lMirc5DmOeKNuA+d nf1aVX9YouTcF/EcbOeuA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1727005097; x=1727091497; bh=4VZSxwnGY/koE x83zW/rTcyIAmjQbDiHKNmiT3D9gCw=; b=HccgUd6J3fqFbltXqSENE2pfJ6uaf ymMQaAsYatWY+3Oco3jBe8/1BYg2Y/ixIZJz0rmfhZakzgOQV2AAhrsc9mX1kcCR nVlaijwCLE1jR8LYY/be0Bfa+sjVcFQP2810edkMzD76eBFwb+PI4kB3qd/3bzwf 1YACQK0ug3Vfr01AQQlLhugBTXS86qnitBdvhXVVQYAfSWin/+yXRfnNGRGkdRjR 2Xi+7hPpFyJd/v3FprdzjER/Cu8MVOs6rkYWwNwMM5ydddTyZ5lnwORYDZfWGHbp opNWF35nog5ICfKlcYogKgWxQ7mS9MsHDtuNdNOdLpRicL/m+eiPLyOhg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeljedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpeeffffftdehteetvdelieehgeehtedvteethefgte eivdetgeegtdejtdduudeludenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhep mhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgtphhtthhopedupdhmoh guvgepshhmthhpohhuthdprhgtphhtthhopeejudekleejseguvggssghughhsrdhgnhhu rdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 07:38:16 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v9 5/8] gnu: simdjson: Update to 3.10.1. Date: Sun, 22 Sep 2024 19:37:06 +0800 Message-ID: <4cf7a5dceff4230dbe4bef12ac7f19a464b0a710.1727004999.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> References: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/cpp.scm (simdjson): Update to 3.10.1. Change-Id: I6711077e162bcfbf6702d521fdeec44e3b21f074 --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7d782c7ea6..c805dae825 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2395,7 +2395,7 @@ (define-public python-jsonnet (define-public simdjson (package (name "simdjson") - (version "3.1.0") + (version "3.10.1") (source (origin (method git-fetch) (uri (git-reference @@ -2404,7 +2404,7 @@ (define-public simdjson (file-name (git-file-name name version)) (sha256 (base32 - "0q784bm8xbz3p782dw02cdds6m71wk3acy94vva8krc9g88142ws")))) + "1qv7lvls7x9aw6mlnwfgchbajsxh6qygp09wpkb2w6mjdbidmi0h")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; tests require downloading dependencies -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 07:39:08 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 11:39:08 +0000 Received: from localhost ([127.0.0.1]:40990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvj-0004ui-Bg for submit@debbugs.gnu.org; Sun, 22 Sep 2024 07:39:08 -0400 Received: from fhigh3-smtp.messagingengine.com ([103.168.172.154]:37803) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssKvT-0004s7-RT for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 07:38:53 -0400 Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfhigh.phl.internal (Postfix) with ESMTP id 2CA531140227 for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 07:38:25 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Sun, 22 Sep 2024 07:38:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1727005105; x=1727091505; bh=sd8otTg1DPqYy5o+NCMcqMN7H4uFqsB4wkSsRVypYsk=; b= C8jTuVjE048UfQPUU3Mi6YFbQeJGdE93WokvKUJSHnhxFhfCC3sjrF/DHR2hbJkk DaJ1P7o9XwW5h5Qx/6MhB1P9We23q7hPWuW1wzp+tNK5RDDaqsfDhdkxlGCKMnyD 5vzr6O2+Jq/oXKUC4xEK6EruG7h+eZIrz3vvmoHdf+XOpV5375q/OZ7UMUH8KZT7 zdJe8qbL1mi67d6kVe34xa7RdgyyAUPDfKiBpVlHLs0dXzpKlboptpnD8nBHw23j WYqGT13TthiBs980SKNmmRCLhtfPIrJLjcGIXnFHmYK6ongmeX2uk1yuyzYb6o0X 9hpB1wXA8UG1I/ztG0Ptcw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727005105; x= 1727091505; bh=sd8otTg1DPqYy5o+NCMcqMN7H4uFqsB4wkSsRVypYsk=; b=q FJfzXoCcWjvrlC45Xwv9UZcesvv0sDjLagvZh6war7/a8dRmXciVQpZ5k0gUUvAD FGTEHa51e2H0UfH4MT1rfqoeBg/UEUOWihkMjI+wrbp+UMARY4tWhw+ii1BvTWXQ bec0HTZxCHmxGEKqDkbtXAsPWHRuh5gA7xqCZNSapO7X2kCjj7XOYzjlU1mbAwiq 2G5ubU6rfdufPm9gE8rJs+HXDe8hERgXK8/u2EimMz9F8xy+LhpVUW4gHJ/uQhxn x9r0wgT2iCLKB2BMVplTuFjE2+DxS7l6kogkvya0AqQDb5nGiZnwIr7B7kcyxOZM QUZY3T/dX6hhe1kWwLYYA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeljedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucgfrhhlucfvnfffucdlud dvmdenucfjughrpefhvffufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpegu rghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghrnhepieekuedvtdevle egheduheelheetfffhhfffhfdvveegveekhefhffeiueeigeeinecuffhomhgrihhnpehg ihhthhhusgdrtghomhdpkhhithifrghrvgdrtghomhenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgt phhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejudekleejseguvg gssghughhsrdhgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 07:38:23 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v9 8/8] gnu: telegram-desktop: Update to 5.5.5. Date: Sun, 22 Sep 2024 19:37:09 +0800 Message-ID: <47de6d0e2fc7cd7c6a4f01daf34f90fd237be37d.1727004999.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> References: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: Update patch file to match upstream changes. * gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch: Update patch file to match upstream changes. * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/telegram.scm: (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)[origin]: Add patches to unbundle gsl and cppgir. (libprisma-for-telegram-desktop): Use %telegram-version. (telegram-desktop): Update to 5.5.5. [:configure-flags]: Add disable jemalloc flag. [#:phases]: Add libprisma-for-telegram-desktop. : New phase. : New phase. : New phase. [native-inputs]: Add cpp-ada-url-parser, gobject-introspection and xdg-desktop-portal. [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite and remove jemalloc. Change-Id: I0ea3ea5a3e416a9d5b2b5b7b55ca1af679bc3d38 --- gnu/local.mk | 2 + ...gram-desktop-allow-disable-libtgvoip.patch | 6 +- .../telegram-desktop-unbundle-cppgir.patch | 95 +++++++++++++++ .../telegram-desktop-unbundle-gsl.patch | 31 +++++ ...or-telegram-desktop-unbundle-libsrtp.patch | 7 +- gnu/packages/telegram.scm | 112 +++++++++++------- 6 files changed, 205 insertions(+), 48 deletions(-) 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 802f4be4fe..dc6c7294e7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2196,6 +2196,8 @@ 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-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-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch index a603bc9d72..1354a1e9cd 100644 --- a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -47,10 +47,9 @@ diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/ca index 5fe9ac677..bebf48e70 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp -@@ -39,8 +39,10 @@ class InstanceImpl; +@@ -39,7 +39,9 @@ class InstanceImpl; class InstanceV2Impl; class InstanceV2ReferenceImpl; - class InstanceV2_4_0_0Impl; +#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP class InstanceImplLegacy; void SetLegacyGlobalServerConfig(const std::string &serverConfig); @@ -58,10 +57,9 @@ index 5fe9ac677..bebf48e70 100644 } // namespace tgcalls namespace Calls { -@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register(); +@@ -56,6 +58,8 @@ const auto Register = tgcalls::Register(); const auto RegisterV2 = tgcalls::Register(); const auto RegV2Ref = tgcalls::Register(); - const auto RegisterV240 = tgcalls::Register(); +#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP const auto RegisterLegacy = tgcalls::Register(); +#endif 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..a24dbe25bb --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch @@ -0,0 +1,95 @@ +From a5c42e07ae223d440ff11347e0cf1fd58fd383df Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 1/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/CMakeLists.txt | 4 +++- + external/glib/generate_cppgir.cmake | 7 ++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt +index 3c6fe4be..c862705f 100644 +--- a/external/glib/CMakeLists.txt ++++ b/external/glib/CMakeLists.txt +@@ -13,9 +13,11 @@ function(add_cppgir) # isolate scope + set(BUILD_EXAMPLES OFF) + add_subdirectory(cppgir EXCLUDE_FROM_ALL) + endfunction() +-add_cppgir() + + include(generate_cppgir.cmake) ++if (NOT CppGir_FOUND) ++ add_cppgir() ++endif() + generate_cppgir(external_glib Gio-2.0) + + find_package(PkgConfig REQUIRED) +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index c15d3f9e..9b0a5ac8 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 2.0) ++ + function(generate_cppgir target_name gir) + set(cppgir_loc ${cmake_helpers_loc}/external/glib/cppgir) + +@@ -17,6 +19,9 @@ function(generate_cppgir target_name gir) + ${cppgir_loc}/data/cppgir.ignore + ${cppgir_loc}/data/cppgir_unix.ignore + ) ++ if (CppGir_FOUND) ++ set(ignore_files) # rely on default ignore list ++ endif() + + set(gir_path) + if (IS_ABSOLUTE "${gir}") +@@ -33,7 +38,7 @@ function(generate_cppgir target_name gir) + --class + --class-full + --expected +- --ignore ++ "$<$:--ignore>" + "$" + --output + ${gen_dst} + +From eed39522952c15f448c54290454806dd011c4996 Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 2/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/generate_cppgir.cmake | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index 9b0a5ac8..2ad82277 100644 +--- a/external/glib/generate_cppgir.cmake ++++ b/external/glib/generate_cppgir.cmake +@@ -15,11 +15,12 @@ function(generate_cppgir target_name gir) + + set(gen_timestamp ${gen_dst}/${target_name}_cppgir.timestamp) + +- set(ignore_files +- ${cppgir_loc}/data/cppgir.ignore +- ${cppgir_loc}/data/cppgir_unix.ignore +- ) +- if (CppGir_FOUND) ++ if (NOT CppGir_FOUND) ++ set(ignore_files ++ ${cppgir_loc}/data/cppgir.ignore ++ ${cppgir_loc}/data/cppgir_unix.ignore ++ ) ++ else() + set(ignore_files) # rely on default ignore list + endif() + 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..f89d326a5c --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch @@ -0,0 +1,31 @@ +From a3ac6df0441b4caca28b1df87febc420e18942ce Mon Sep 17 00:00:00 2001 +From: Zephyr Lykos +Date: Mon, 23 Oct 2023 15:55:24 +0800 +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 8eaf19c5..344f9488 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) diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch index 486f0b1aa5..3317d0a9c1 100644 --- a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch @@ -17,10 +17,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index af7d24c21..66bec8fdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2647,6 +2647,9 @@ if (TG_OWT_USE_PROTOBUF) - list(APPEND export_targets proto) - endif() - +@@ -2647,5 +2647,8 @@ if (APPLE) + libyuv + ) +if (LIBSRTP_FOUND) + target_compile_definitions(tg_owt PRIVATE HAVE_LIBSRTP) +endif() diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index af16d4840b..084b14088a 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2023 Lu Hui ;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; Copyright © 2024 Ricardo Wurmus +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,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) @@ -44,7 +46,6 @@ (define-module (gnu packages telegram) #:use-module (gnu packages gtk) #:use-module (gnu packages hunspell) #:use-module (gnu packages image) - #:use-module (gnu packages jemalloc) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages language) #:use-module (gnu packages libevent) @@ -82,11 +83,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 "5.5.5") (define libyuv-for-telegram-desktop - (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") - (revision "2439")) + (let ((commit "04821d1e7d60845525e8db55c7bcd41ef5be9406") + (revision "2440")) (origin (method git-fetch) (uri (git-reference @@ -97,79 +98,84 @@ (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 "05a7db2e2d2a59ecf42483debca4944d09154b5b"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) + (patches + ;; https://github.com/desktop-app/cmake_helpers/pull/320 + ;; https://github.com/desktop-app/cmake_helpers/pull/305 + (search-patches "telegram-desktop-unbundle-gsl.patch" + "telegram-desktop-unbundle-cppgir.patch")) (sha256 (base32 - "0y96mvzs113zh8bdw1h3i6l0pgwg93rigrday8kfdg4magz686k6")))) + "1gapyk5a8rsl8vigbz0l8h9858f2lkhkd2pjy72zivp0mrq8w0hr")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "1a969faa0afb29d53af03e530775eccdfb8433f1"))) + (commit "0af136124083369073b8fdaf45f0816fd2b10bad"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1xmw8dfm51p5g20rlmzqnr72a14ngyxwq09an8clf1v5s6mmwvak")))) + "057bwn9smrgnyfb1vraf50ihbkhjc4d72msl7vnbqc4h5sg8dav9")))) (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 "547e7f2914d9b5548dd17e70a3a7bf5d6606afc3"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83")))) + "0sgm2prhd4fw89afh62k7i4i7mj60n170kqz50b0mad927zngxvn")))) (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 "c1d6b0273653095b10b4d0f4f7c30b614b690fd5"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "06mzafnjpfr5ih297dh7bxm6bgpg0wy0gv2r2732n5szyrg9sdl6")))) + "1sxn3qccsfbx1289z0fdrb4cggs16a8r75ic6wi81c6lnkrdi3wl")))) (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 (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_qr.git") - (commit "501f4c3502fd872ab4d777df8911bdac32de7c48"))) + (commit "6fdf60461444ba150e13ac36009c0ffce72c4c83"))) (file-name (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) + "1i5n3qvjkf4nv8k75cc0a71xyvpklc4nzg4k2zsfr2pxk0cy7hkw")))) (define lib-rpl-for-telegram-desktop (origin @@ -188,88 +194,88 @@ (define lib-spellcheck-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "ae89fefd239ecc47d4dab7ba29f9e230376a57d3"))) + (commit "e76981e133a1d29f3ceb557f53850a8d822f439a"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "147xbbcza5q4wcdipk5jplajzkc48971kg2s7qv5jlz33sxkw1lq")))) + "0dslsy3d6gmxaj6yv49zjgl2b2mh75j7fpnbynglr02h3m2fdj96")))) (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 "ccdc72548a5065b5991b4e06e610d76bc4f6023e"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) + "0b11ix95dzpkz335q0a6b5yg8qhj33s4fgj9ppl37pszcqq1j3wi")))) (define lib-tl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_tl.git") - (commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa"))) + (commit "237cbeb9d1c637759f89a508c1d854caf16e1984"))) (file-name (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk")))) + "1ji3gypy4yf9knsgylnyz5gc2kii7lls5ymj1rkf0daixdz931cm")))) (define lib-ui-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "37531086ec21a8569deddedb11b402f8a3157b90"))) + (commit "c4e3a08e6fb90a6174c8b592d9eb747dd4d3f9c5"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0")))) + "1lbfy4fbb52lklfwn6kxny3mwl653r4vc80k922kwjfgbcy9c25f")))) (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "b68a95ad4d1ae9a1827671100a7fd76cbe448c3f"))) + (commit "8751e27d50d2f26b5d20673e5ddba38e90953570"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1c8jwdnn26n13yp0rp0l71q6xlxa6wp3cspbm3pnghw964jwgp3z")))) + "0f05pqb83qckghzlhnwqbi9qfi9xw7qsv8jampl4qyaq9q0w9p20")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "f632fc84cbc62ae8abbbd05f81d472757a337c11"))) + (commit "2de655f58dc327e40d5d9df71300a0d0fdb39c9f"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i")))) + "12vrif0685vb068mj5sd7cknav1n66jysp18j21nlp0am9pw7ydj")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "2e2797648aac2588e7fe479c2e8b4455ec65c5e6"))) + (commit "9bf4065ea00cbed5e63cec348457ed13143459d0"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) + "1p563a11w8jrid96xf03dg6j39ciz28n5f4r6g28lxhiphbqzfym")))) (define-public webrtc-for-telegram-desktop - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") - (revision "389")) + (let ((commit "c425281150317753d7bc5182c6572abe20f9a784") + (revision "456")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -285,7 +291,7 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) + (base32 "1fj48iq56awnrckncy1qc3zhdzifl725hbb6an7wg2v3zmagvrwn")) (patches (search-patches ;; https://github.com/desktop-app/tg_owt/pull/123 @@ -407,7 +413,7 @@ (define libprisma-for-telegram-desktop (url "https://github.com/desktop-app/libprisma") (commit "23b0d70f9709da9b38561d5706891a134d18df76"))) (file-name - (git-file-name "libprisma-for-telegram-desktop" "5.3.2")) + (git-file-name "libprisma-for-telegram-desktop" %telegram-version)) (sha256 (base32 "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) @@ -427,7 +433,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) + (base32 "12fdybn085s3i3a8hwi0bmdns7jxvg0k662n04jgffirgsz8n54m")) (patches (search-patches ;; https://github.com/telegramdesktop/tdesktop/pull/24126 @@ -468,7 +474,10 @@ (define-public telegram-desktop "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" - "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON") + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + ;; Enabling jemalloc causes SIGSEGV. This probably happened + ;; after upgrading to glibc 2.39. + "-DDESKTOP_APP_DISABLE_JEMALLOC=ON") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'unpack-additional-sources @@ -493,21 +502,45 @@ (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 'unpack-additional-sources 'use-system-xdg-desktop-portal + (lambda _ + (substitute* (list "Telegram/CMakeLists.txt" + "Telegram/lib_base/CMakeLists.txt") + (("\\$\\{third_party_loc\\}/xdg-desktop-portal/data") + (string-append #$(this-package-native-input "xdg-desktop-portal") + "/share/dbus-1/interfaces"))))) + ;; Remove this constexpr keyword to make it compatible with gcc-final. + (add-after 'use-system-xdg-desktop-portal 'patch-libwebview + (lambda _ + (substitute* "Telegram/lib_webview/webview/webview_interface.h" + (("constexpr ") "")))) (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 (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list `(,glib "bin") + (list cpp-ada-url-parser + `(,glib "bin") + gobject-introspection `(,gtk+ "bin") pkg-config - python-wrapper)) + python-wrapper + xdg-desktop-portal)) (inputs (list abseil-cpp-cxxstd17 alsa-lib + boost c++-gsl + cppgir-for-telegram-desktop crc32c + expected-lite fcitx-qt5 fcitx5-qt ffmpeg @@ -516,7 +549,6 @@ (define-public telegram-desktop gtk+ hime hunspell - jemalloc kcoreaddons-5 kimageformats-5 libdispatch -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 17:33:15 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 21:33:15 +0000 Received: from localhost ([127.0.0.1]:42856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssUCh-0003n8-9I for submit@debbugs.gnu.org; Sun, 22 Sep 2024 17:33:15 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:49226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssUCe-0003mt-0H for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 17:33:14 -0400 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-a8d2b4a5bf1so535502666b.2 for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 14:32:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727040704; x=1727645504; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=+5q4ERKhfA/JU9IQJZgzl3gyH5J/rDY6BPfVQWv7D7E=; b=G+d1L89aAplMXwRmZ+obHJEADpCXsqIoNOCQDwl6JCSTt1CaOhf/8FFXIly84pa+Ux xxFZz6rrv5UJ/CuP9SHJmzrYtAsD3J7cOWHQS9tXnknMSjDFOEvVW2Qr3jXGvOR3M+Mj XeykVajFOPlovGR/EmfZuhJI4YQwl4xZAU/j+RU4nib5WlGky9fib63D/BKxFE4CwPb5 E1zMw1hgmyLRIu5iPJXfMcGpUIZtpDHOxevHvK559P7+eMjuMBybyW/lgwFYSn47Pdv/ srH5FJ3YNb8fEsVk8UD7s+aTcUx5yJC7GdgUAmCPSnePX5fKHJlA5N0EcRsUSfFBE6JR o9qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727040704; x=1727645504; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+5q4ERKhfA/JU9IQJZgzl3gyH5J/rDY6BPfVQWv7D7E=; b=mcLNUb8WyDZlQzeICwDCylSgFxl5fuesOP2qEu8uIp7QsH2Nwqoa3X721xCPWAYqF1 drc9Gz4xXXQ/coCnLdnZSV5CDgDDs/p1d/XR3iMcFygejqcdobkPzwpCZyZvwsUvjS4n dy8WWtuhBXfiPZiP+S+1W2v7vpQeMKTcR2tB+MBywt94xC5n6hYUvVAfaS4qYwxulRJc 6jlc1Odf6MFHkm9rzCqpXP+TFuYVRfThrQ8fjjvDMx56anwpBVsDhO2qEbrk3oWDfmZN expRSVA8dNi34QoekEz2hmgWmaDOGG5dgNN20KyaK04K3USQVdlGtQiRaS+ymNoyG9JC MXUA== X-Forwarded-Encrypted: i=1; AJvYcCUJ9xhS7fWFPKkB+PaGRfX5fab9FuQI3JWFrfdev2Qi2NBpZawinMDBaOZNccmM86s8U7oUUw==@debbugs.gnu.org X-Gm-Message-State: AOJu0YyIW+eR02HZzg+qrNABHB0ccQDLfilXeIzp3Nz9CnulT3vjJ5W6 C6DZju8MEjNaWWtgV3uwKUhZNnnRMRcz4w3h62Ps6NPIRPfaQSe7 X-Google-Smtp-Source: AGHT+IEFC3AVWuvz29d44pmU5KXZML8vebRR7XhEPOBDWI7t3AV0/xsPBZIy4A3DuWunI9jKRJkFcg== X-Received: by 2002:a17:906:fe44:b0:a8d:2ab2:c990 with SMTP id a640c23a62f3a-a90d519b92fmr1008647066b.64.1727040703591; Sun, 22 Sep 2024 14:31:43 -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 a640c23a62f3a-a9061330b08sm1124031966b.201.2024.09.22.14.31.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Sep 2024 14:31:43 -0700 (PDT) Message-ID: <58b705505530018b08ac405426922070c5157402.camel@gmail.com> Subject: Re: [bug#71897] [PATCH v9 6/8] gnu: Add cpp-ada-url-parser. From: Liliana Marie Prikler To: dan , 71897@debbugs.gnu.org Date: Sun, 22 Sep 2024 23:31:41 +0200 In-Reply-To: References: <83ca4396dc74dbbc52121f1628fdc27f9b06d9fa.1727004999.git.i@dan.games> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Sharlatan Hellseher , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gU29ubnRhZywgZGVtIDIyLjA5LjIwMjQgdW0gMTk6MzcgKzA4MDAgc2NocmllYiBkYW46Cj4g KiBnbnUvcGFja2FnZXMvY3BwLnNjbSAoY3BwLWFkYS11cmwtcGFyc2VyKTogTmV3IHZhcmlhYmxl Lgo+IChjcG0tZm9yLWNwcC1hZGEtdXJsLXBhcnNlcik6IE5ldyB2YXJpYWJsZS4KPiAKPiBDaGFu Z2UtSWQ6IEkwYjYxYzNiMTM2ZTI3ODE3NzRjNmE1ZTY3ZWViNmI2NjJlOTdkZDg4Cj4gLS0tCj4g wqBnbnUvcGFja2FnZXMvY3BwLnNjbSB8IDU4Cj4gKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysKPiDCoDEgZmlsZSBjaGFuZ2VkLCA1OCBpbnNlcnRpb25zKCspCj4g Cj4gZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9jcHAuc2NtIGIvZ251L3BhY2thZ2VzL2NwcC5z Y20KPiBpbmRleCBjODA1ZGFlODI1Li4yOWU1MGQ0NTMxIDEwMDY0NAo+IC0tLSBhL2dudS9wYWNr YWdlcy9jcHAuc2NtCj4gKysrIGIvZ251L3BhY2thZ2VzL2NwcC5zY20KPiBAQCAtMzI4NCwzICsz Mjg0LDYxIEBAIChkZWZpbmUtcHVibGljIHRsLW9wdGlvbmFsCj4gwqB0aGUgc3RkOjpvcHRpb25h bCBmb3IgQysrMTEvMTQvMTcsIHdpdGggc3VwcG9ydCBmb3IgbW9uYWRpYwo+IG9wZXJhdGlvbnMg YWRkZWQgaW4KPiDCoEMrKzIzLiIpCj4gwqDCoMKgwqAgKGxpY2Vuc2UgbGljZW5zZTpjYzApKSkK PiArCj4gKyhkZWZpbmUgY3BtLWZvci1jcHAtYWRhLXVybC1wYXJzZXIKPiArwqAgKGxldCAoKHZl cnNpb24gIjAuMzguNiIpKQo+ICvCoMKgwqAgKG9yaWdpbgo+ICvCoMKgwqDCoMKgIChtZXRob2Qg Z2l0LWZldGNoKQo+ICvCoMKgwqDCoMKgICh1cmkgKGdpdC1yZWZlcmVuY2UKPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAodXJsICJodHRwczovL2dpdGh1Yi5jb20vY3BtLWNtYWtlL0NQTS5jbWFr ZSIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvbW1pdCAoc3RyaW5nLWFwcGVuZCAidiIg dmVyc2lvbikpKSkKPiArwqDCoMKgwqDCoCAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lICJjcG0t Zm9yLWNwcC1hZGEtdXJsLXBhcnNlciIKPiB2ZXJzaW9uKSkKPiArwqDCoMKgwqDCoCAoc2hhMjU2 IChiYXNlMzIKPiAiMXFiYmhkcTZjejJ5N3FmeXkxazExaTk4ZDEzczIyOXIzcGhkNXkzbjVtYXE1 MWt5OGJnYiIpKSkpKQo+ICsKPiArKGRlZmluZS1wdWJsaWMgY3BwLWFkYS11cmwtcGFyc2VyCj4g K8KgIChwYWNrYWdlCj4gK8KgwqDCoCAobmFtZSAiY3BwLWFkYS11cmwtcGFyc2VyIikKPiArwqDC oMKgICh2ZXJzaW9uICIyLjkuMiIpCj4gK8KgwqDCoCAoc291cmNlCj4gK8KgwqDCoMKgwqAgKG9y aWdpbgo+ICvCoMKgwqDCoMKgwqDCoCAobWV0aG9kIGdpdC1mZXRjaCkKPiArwqDCoMKgwqDCoMKg wqAgKHVyaSAoZ2l0LXJlZmVyZW5jZQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAodXJs ICJodHRwczovL2dpdGh1Yi5jb20vYWRhLXVybC9hZGEiKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAoY29tbWl0IChzdHJpbmctYXBwZW5kICJ2IiB2ZXJzaW9uKSkpKQo+ICvCoMKgwqDC oMKgwqDCoCAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCj4gK8KgwqDC oMKgwqDCoMKgIChzaGEyNTYgKGJhc2UzMgo+ICIweHZ2amxpYTYyN2FqbDk2NmdkeHp5MmIxajBq aWlteDd6eDh5cG1mZnd4MGs2eDcycWFtIikpKSkKPiArwqDCoMKgIChidWlsZC1zeXN0ZW0gY21h a2UtYnVpbGQtc3lzdGVtKQo+ICvCoMKgwqAgKGFyZ3VtZW50cwo+ICvCoMKgwqDCoCAobGlzdAo+ ICvCoMKgwqDCoMKgICM6Y29uZmlndXJlLWZsYWdzICN+KGxpc3QgIi1EQ1BNX0xPQ0FMX1BBQ0tB R0VTX09OTFk9T04iKQo+ICvCoMKgwqDCoMKgICM6cGhhc2VzCj4gK8KgwqDCoMKgwqAgI34obW9k aWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCj4gK8KgwqDCoMKgwqDCoMKgwqDCoCAoYWRkLWFm dGVyICd1bnBhY2sgJ3BhdGNoLWRlcHMKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRh IF8KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN1YnN0aXR1dGUqICJDTWFrZUxpc3Rz LnR4dCIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoImNtYWtlL0NQTS5jbWFr ZSIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdHJpbmctYXBwZW5kICMk Y3BtLWZvci1jcHAtYWRhLXVybC1wYXJzZXIKPiAiL2NtYWtlL0NQTS5jbWFrZSIpKQo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgV2UgZm9yY2UgQ1BNIHRvIGZpbmQgc3lzdGVt IHBhY2thZ2VzIHJhdGhlciB0aGFuCj4gdXNpbmcgZ2l0CkRvZXNuJ3QgQ01ha2UgaGF2ZSBhIGxv b2t1cCBtZWNoYW5pc20gZm9yIHRob3NlIHRvbz8gIENvdWxkIHdlIG5vdCBqdXN0CmRlbGV0ZSB0 aGUgZmlsZSB0aHJvdWdoIGEgc25pcHBldCBhbmQgYWRkIHRoaXMgYXMgbmF0aXZlIGlucHV0PwoK PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IHRvIGRvd25sb2FkIHRoZW0uCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCJHaXRfRk9VTkQiKSAiVFJVRSIpCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCIzLjkuMSIpCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgICMkKHBhY2thZ2UtdmVyc2lvbiAodGhpcy1wYWNrYWdlLW5h dGl2ZS1pbnB1dAo+ICJzaW1kanNvbiIpKSkpCllvdSBtaWdodCB3YW50IHRvIHVzZSB0aGUgcGFj a2FnZSBhcyBuZWVkbGUgYXMgd2VsbCwgaS5lLgooc2ltZGpzb25AKVswLTkuXSogYW5kIHRoZW4g cmVwbGFjZSB0aGUgdmVyc2lvbiBzdWJzdHJpbmcuICBUaGlzIGlzCm1vcmUgcm9idXN0IGluIHRo ZSBmYWNlIG9mIG11bHRpcGxlIHBhY2thZ2VzIGhhdmluZyB0aGUgc2FtZSB2ZXJzaW9ucwpieSBh Y2NpZGVudCBvZiBvbmUgcGFja2FnZSBnZXR0aW5nIHZlcnNpb24tYnVtcGVkLiAKPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN1YnN0aXR1dGUqICJ0b29scy9jbGkvQ01ha2VMaXN0cy50 eHQiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCIzLjIuMCIpCj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICMkKHBhY2thZ2UtdmVyc2lvbiAodGhpcy1wYWNr YWdlLW5hdGl2ZS1pbnB1dAo+ICJjeHhvcHRzIikpKSkpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqAg KGFkZC1hZnRlciAncGF0Y2gtZGVwcyAncHl0aG9uLXppcGZpbGUtZGlzYWJsZS1zdHJpY3QtCj4g dGltZXN0YW1wcwo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsYW1iZGEgXwo+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAoc3Vic3RpdHV0ZSogInNpbmdsZWhlYWRlci9hbWFsZ2FtYXRl LnB5Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiemlwZmlsZS5aSVBfREVG TEFURUQiKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiemlwZmlsZS5aSVBf REVGTEFURUQsCj4gc3RyaWN0X3RpbWVzdGFtcHM9RmFsc2UiKSkpKSkpKQo+ICvCoMKgwqAgKG5h dGl2ZS1pbnB1dHMKPiArwqDCoMKgwqAgKGxpc3QgY3h4b3B0cwo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoCBmbXQtMTAKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqAgZ29vZ2xldGVzdAo+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoCBweXRob24KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqAgc2ltZGpzb24pKQo+ ICvCoMKgwqAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRodWIuY29tL2FkYS11cmwvYWRhIikKPiAr wqDCoMKgIChzeW5vcHNpcyAiVVJMIHBhcnNlciIpCj4gK8KgwqDCoCAoZGVzY3JpcHRpb24gIkFk YSBpcyBhIGZhc3QgYW5kIHNwZWMtY29tcGxpYW50IFVSTCBwYXJzZXIKPiB3cml0dGVuIGluIEMr Ky4KPiArU3BlY2lmaWNhdGlvbiBmb3IgVVJMIHBhcnNlciBjYW4gYmUgZm91bmQgZnJvbSB0aGUg V0hBVFdHIHdlYnNpdGUuIikKPiArwqDCoMKgIChsaWNlbnNlIGxpY2Vuc2U6Z3BsMyspKSkKQ2hl ZXJzCg== From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 19:05:10 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 23:05:10 +0000 Received: from localhost ([127.0.0.1]:42905 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVdd-0000uN-Ip for submit@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:09 -0400 Received: from fout5-smtp.messagingengine.com ([103.168.172.148]:39289) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVdb-0000tl-FR for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:08 -0400 Received: from phl-compute-07.internal (phl-compute-07.phl.internal [10.202.2.47]) by mailfout.phl.internal (Postfix) with ESMTP id E85ED13801CE; Sun, 22 Sep 2024 19:04:39 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-07.internal (MEProxy); Sun, 22 Sep 2024 19:04:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1727046279; x= 1727132679; bh=PjRv13WVoLXsDBl8YiHekQ1g5nLCBIkZ1hYpujGR5v4=; b=M Q4Fj3dlwl+hoDqdcpcXiG5NyiTv54JD5ccPaudBFD/jyl5KBZbKtRGlq6yL+neBY H53V4C0ndnnXjw8seFmJV0PS2Ih86loOtWp2hhsQwwLSMrUFBipeNoOkAFah56Kp oUHsi3tTpT/9Y4KZ+/Iat725OyAlDPHI6vds5LMGYk9B6p2NYSkTqimyt26/pF+z LGyKaWmGSjaOsemOt9fOXCpswST8ErkHEHuNnwJag22QJDc7s8PuxcnJqSNh1Hra 4H2Y4WJHoTXzj+aKi35Qz/thbXmhrlx2S57y/mhq/J72VR4XcztkJjtQW/YuS9fo 9ZAdkZzlokuszi2JAjoWw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727046279; x= 1727132679; bh=PjRv13WVoLXsDBl8YiHekQ1g5nLCBIkZ1hYpujGR5v4=; b=I uTh/7tN/kF6H71H6oIKltwXqpBBjHw/de0MjKCaEfTmxQYlBHqQg6ayVf5Hmk0O9 LS8qdXTZAhZ0HEXLk+pwThnqjqIMAG7ZV1RezKpEF4E691e5EkBtxAUod2VxClNc eRhfsObhZ1S3i14L1CBtCYolhsQtHfTFgJGFjA9uNwXZ8mchYpmB1lfmyTnNOf0x 31UTpvulLwW8oXyP5Z5uo9aGlwtxjkQdAOgD2wQ2zmWhV7kZ1+Qv+VGrGvx5uW/9 8jIPEUh7SZhuFca4WOLWgTT/keFkHbwEdxTpJPJiqyMJ7kU3qxaQuImc9fkAdwOJ W0RL9mIKkYt2L/OSi7wKw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelkedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredttden ucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgvrhhnpe dtgeekheeggeettdevtedufedtfffhuddtvedtueeugfegtdettddutedtgedtleenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrd hgrghmvghspdhnsggprhgtphhtthhopeefpdhmohguvgepshhmthhpohhuthdprhgtphht thhopeejudekleejseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtoheplhhilh hirghnrgdrphhrihhklhgvrhesghhmrghilhdrtghomhdprhgtphhtthhopehmrgigihhm rdgtohhurhhnohihvghrsehgmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 22 Sep 2024 19:04:37 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v10 2/9] gnu: xdg-desktop-portal: Improve style. Date: Mon, 23 Sep 2024 07:04:01 +0800 Message-ID: <20885b868c34a35ae742c5b9d83f7ee9f9fe097e.1727046228.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 Cc: Liliana Marie Prikler , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Liliana Marie Prikler * gnu/packages/freedesktop.scm (xdg-desktop-portal) [inputs]: Move after arguments. Drop labels. [native-inputs]: Move after inputs. Drop labels. Reviewed-by: Maxim Cournoyer --- gnu/packages/freedesktop.scm | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index f00f4b3956..664adf0cb2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3001,26 +3001,6 @@ (define-public xdg-desktop-portal ;; Disable portal tests since they try to use fuse. (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) (build-system meson-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("glib:bin" ,glib "bin") - ("gettext" ,gettext-minimal) - ("python" ,python) - ("python-dbusmock" ,python-dbusmock) - ("python-pytest" ,python-pytest) - ("python-pytest-xdist" ,python-pytest-xdist))) - (inputs - `(("bubblewrap" ,bubblewrap) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) - ("flatpak" ,flatpak) - ("fontconfig" ,fontconfig) - ("json-glib" ,json-glib) - ("libportal" ,libportal) - ("dbus" ,dbus) - ("geoclue" ,geoclue) - ("pipewire" ,pipewire) - ("fuse" ,fuse))) (arguments `(#:configure-flags (list "-Dsystemd=disabled") @@ -3034,6 +3014,26 @@ (define-public xdg-desktop-portal (find-files "po" "\\.po$")))) (add-after 'unpack 'set-home-directory (lambda _ (setenv "HOME" "/tmp")))))) + (inputs + (list bubblewrap + dbus + flatpak + fontconfig + fuse + gdk-pixbuf + geoclue + glib + json-glib + libportal + pipewire)) + (native-inputs + (list gettext-minimal + `(,glib "bin") + pkg-config + python + python-dbusmock + python-pytest + python-pytest-xdist)) (native-search-paths (list (search-path-specification (variable "XDG_DESKTOP_PORTAL_DIR") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 19:05:14 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 23:05:14 +0000 Received: from localhost ([127.0.0.1]:42911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVdi-0000un-0Q for submit@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:14 -0400 Received: from fhigh2-smtp.messagingengine.com ([103.168.172.153]:36181) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVdY-0000tV-Hx for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:08 -0400 Received: from phl-compute-09.internal (phl-compute-09.phl.internal [10.202.2.49]) by mailfhigh.phl.internal (Postfix) with ESMTP id 205CB11400D4; Sun, 22 Sep 2024 19:04:36 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-09.internal (MEProxy); Sun, 22 Sep 2024 19:04:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm3; t=1727046276; x=1727132676; bh=Vw 8lqjK/z9HVxr12Mr+kIeKqzr3b0oze2lvpzTVNZAQ=; b=X2U2GfIRAL3Ki/0Yy6 ZgerzKfkePI2IPYSYxjlnkEalPFRXHgEUpun4shscfQ9Ixr/MegGCjqWMj4Sd99u mhwiAgxPxYavzTHQWZFx/RLZwB5csH8g5i2yeEJQyb3yx6bxcY+mSVoJgcCHtu88 SGJj4ncEI1P4OoEBFas9guvO87d6vPTn5ONUctkjESNTbU9HwWCSt+YlxYmKnqUO KOrJ2ixFLeM13nT5zLcj33EJiP0hMSdkq2Olj6olIzQn4thgJl/xKkHQsiP4+vKw g0NUuH8Bmn+KorqhjrabZt5L8tM3TxVO9z2gTfD3PsHzeL/SqL9/IrBpHFhURuWw F9Uw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1727046276; x=1727132676; bh=Vw8lqjK/z9HVx r12Mr+kIeKqzr3b0oze2lvpzTVNZAQ=; b=pA+sPo80dgu4drhYVXurRm6T4yUsy nDHuhQiMhS9BzodkT9At8wQgJuyaflzmyDAe15Smim7xQnnQqWSIiAHlPmnebWQ6 asIIyKDJT6WzXLsou+X+EM8yPs3cRLWzGSz8twH0i4Y42rzpKrx4s1Ae4e854G1J S5ZkuXP+7Fdkm1w8SorCbkzN+R6mdNfUZBEeH9hKktBRoE/oaPMmOM+DFLl/ZF/O Dfbr46tj+i245FCh5D2h+Y2xmNOau0rWHj2uEjigYYWQVnoI+KxN+5Pk9qDEQTh0 UPBNi8f3hZZB9J8zEo/+BzTeLx3H2ymLaFs4YQ++3yP73eSNZqYbAstqw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelkedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofggtgfgsehtkeertdertdejnecu hfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghrnhepje efheegveffgefhuedtkeegueevleeiueejgffgjeffvdejleevtdejleelieehnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepfedpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehmrgigih hmrdgtohhurhhnohihvghrsehgmhgrihhlrdgtohhmpdhrtghpthhtoheplhhilhhirghn rgdrphhrihhklhgvrhesghhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 22 Sep 2024 19:04:33 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v10 1/9] gnu: xdg-desktop-portal: Update to 1.18.4. Date: Mon, 23 Sep 2024 07:04:00 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 Cc: Liliana Marie Prikler , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.18.4. [patches]: Disable portal tests. [native-inputs]: Remove autoconf, automake, libtool and which. Add python, python-dbusmock, python-pytest and python-pytest-xdist. [inputs]: Add bubblewrap. [arguments]<#:configure-flags>: Replace “--with-systemd=no” with “-Dsystemd=disabled”. Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 25 +++++---- ...-desktop-portal-disable-portal-tests.patch | 56 +++++++++++++++++++ 3 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8e7abc8a47..802f4be4fe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2303,6 +2303,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-dbus-group-policy.patch \ %D%/packages/patches/x265-arm-flags.patch \ + %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xen-docs-use-predictable-ordering.patch \ %D%/packages/patches/xen-remove-config.gz-timestamp.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 993bb84ec6..f00f4b3956 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2024 aurtzy ;;; Copyright © 2024 Dariqq ;;; Copyright © 2024 Wilko Meyer +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -136,6 +137,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages video) + #:use-module (gnu packages virtualization) #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -2986,7 +2988,7 @@ (define-public libportal (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.16.0") + (version "1.18.4") (source (origin (method url-fetch) @@ -2995,18 +2997,21 @@ (define-public xdg-desktop-portal version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav")))) - (build-system gnu-build-system) + "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q")) + ;; Disable portal tests since they try to use fuse. + (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("glib:bin" ,glib "bin") - ("which" ,which) - ("gettext" ,gettext-minimal))) + ("gettext" ,gettext-minimal) + ("python" ,python) + ("python-dbusmock" ,python-dbusmock) + ("python-pytest" ,python-pytest) + ("python-pytest-xdist" ,python-pytest-xdist))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) + `(("bubblewrap" ,bubblewrap) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("flatpak" ,flatpak) ("fontconfig" ,fontconfig) @@ -3018,7 +3023,7 @@ (define-public xdg-desktop-portal ("fuse" ,fuse))) (arguments `(#:configure-flags - (list "--with-systemd=no") + (list "-Dsystemd=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'po-chmod diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch new file mode 100644 index 0000000000..5e13493613 --- /dev/null +++ b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch @@ -0,0 +1,56 @@ +From b7750fa99c31c5f28ac2053fa154bef4038b5cc0 Mon Sep 17 00:00:00 2001 +From: dan +Date: Tue, 2 Jul 2024 19:37:38 +0800 +Subject: [PATCH] tests: remove portal tests. + +--- + tests/meson.build | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index a2dafee..bcd87be 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -181,18 +181,6 @@ portal_tests = [ + + test_env = env_tests + test_env.set('XDG_CURRENT_DESKTOP', 'test') +-foreach p : portal_tests +- test( +- 'test-portals-@0@'.format(p), +- test_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/portal/@0@'.format(p)], +- depends: [test_backends, test_portals], +- env: test_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + # Split the portal tests into one test per portal, this makes debugging a lot + # easier. +@@ -204,18 +192,6 @@ portal_limited = [ + + limited_env = env_tests + limited_env.set('XDG_CURRENT_DESKTOP', 'limited') +-foreach p : portal_limited +- test( +- 'limited-portals-@0@'.format(p), +- limited_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/limited/@0@'.format(p)], +- depends: [test_backends, limited_portals], +- env: limited_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + if enable_installed_tests + install_data( + +base-commit: 11c8a96b147aeae70e3f770313f93b367d53fedd +-- +2.41.0 + base-commit: fc059c66cf8456aa7e456be8c3bc706c4e70fcaf -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 19:05:15 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 23:05:15 +0000 Received: from localhost ([127.0.0.1]:42913 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVdi-0000uu-Ly for submit@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:15 -0400 Received: from fhigh2-smtp.messagingengine.com ([103.168.172.153]:42921) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVde-0000u2-KE for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:11 -0400 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.phl.internal (Postfix) with ESMTP id 4DCF411400FA for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 19:04:43 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Sun, 22 Sep 2024 19:04:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1727046283; x=1727132683; bh=waTakVTyAItEDFV/nXn/isK6MZK+UiZn2kzLXw80O70=; b= Rch5GIZ2FaSPVeXZn380iaLFRjaeOzEDANHSzjj+hD9tiIYwVAfZSHe2uybYQGsV rpVw9ssmNoukElBLtzoTQ+06dS45p8o5xuak0G7dFy6L1w2wnnE6TQ2cS9zTli+l wPEb4lf7ka3H/3EU/xC/lHD8qC/xnWVcfAvKhnI5+CWSMFy/AnqY3d0Hxjf8kHgK tWndlVvvR1UBPdOH+fYjZ9rkmByi0DpoKLQBU58VauojZl2IMmZ3tN6+VgAnKK6S qEs3et/bWYYfhd9Yvp1cmJB1s2UWzML0TUX158LmfYNJcDahhABtWDVa2gKDbBxl w37X5OevEEGaFwhLIYqKmA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727046283; x= 1727132683; bh=waTakVTyAItEDFV/nXn/isK6MZK+UiZn2kzLXw80O70=; b=W 061cg7wQGaQOR3KBYiKbpVVjQKTk2kG5u+F41W1NUqbz8GoLj0j/rofv2yePBbDz a9jrQ2g9NJwv9IFLbDDRON8eTYtILwPqNwFghPOFb5IJfH6Sob41hYcYDEtQ/8Fg AaX3sII6eQpviUahc+DmZTPohXyRECzPKtiYlzQAp8k3Zt/EWLPwLE0DLHSL+s0l kPtOHn9wiZZEgcX8xvRpp/1jlQsEPlJv3zhj21IeDgoMPZGNY09+QlTTdmHEf0V3 tGvJvObebHoyI2I/iDZ3sshrTMC6NpTimwN3OUm6bhuTEHRMLXOhU2647xZoBW0e lig5BEKcUE1WFYHv59Ycw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelkedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgr mhgvsheqnecuggftrfgrthhtvghrnhepgfettddtgfdttdeiffdufeefleegtddutddvve ehkedtieefvdeifeeiffeijeeunecuffhomhgrihhnpehgihhtlhgrsgdrtghomhenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrd hgrghmvghspdhnsggprhgtphhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphht thhopeejudekleejseguvggssghughhsrdhgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 19:04:41 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v10 3/9] gnu: Add cppgir. Date: Mon, 23 Sep 2024 07:04:02 +0800 Message-ID: <6d2b8658d52963fcf3faca754dc5486639e85ad5.1727046228.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher , Vivien Kraus Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/glib.scm (cppgir): New variable. Change-Id: Ic4510be6d05b7b3977aa457c6a7fec382c1d3a88 --- gnu/packages/glib.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d6275ea63e..a479199cdd 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2023 Saku Laesvuori ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Remco van 't Veer +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -72,6 +73,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) @@ -1592,3 +1594,30 @@ (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 "2.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cj4myqzb28hgb7zlxlba9y8n4ysxkvv2y9wy6f7ps58mr18h7bl")))) + (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 "C++ bindings generator for GObject introspection") + (description "cppgir processes @file{.gir} files derived from GObject +introspection annotations into a set of C++ files defining suitable +namespaces, classes and other types that together form a C++ binding.") + (license license:expat))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 19:05:22 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 23:05:22 +0000 Received: from localhost ([127.0.0.1]:42919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVdq-0000vc-8o for submit@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:22 -0400 Received: from fhigh2-smtp.messagingengine.com ([103.168.172.153]:60699) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVdh-0000uJ-JU for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:13 -0400 Received: from phl-compute-07.internal (phl-compute-07.phl.internal [10.202.2.47]) by mailfhigh.phl.internal (Postfix) with ESMTP id 4893C11400D3 for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 19:04:46 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-07.internal (MEProxy); Sun, 22 Sep 2024 19:04:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1727046286; x= 1727132686; bh=KayNk14xkBuPFM1yAz9i90vpTdlvLmL/1FOVcEEeJfk=; b=N IgCDjyemFXb36yTxUXuEi+8iCC8C117OG3hQK5+X/sD88t9eMao3ePSrCuBvtFZd CYLk6muKflAvAR3kxT5+dLXbRx5mdqmM2r7mCrUqo7O0tPDDDQ2horl54/hluJNM wLLF0qGmsyZvjS4dzvJuns5upyrpi8+sXFUo/I2TXEqXZ6dgORIdJFMmuHBPdVFW yqGUaiGxhE/3sX0EL2OhiMy+y5APvifzVF3dhDKRNoiNJuJAzXihIB4p/e4QIva/ Tft0mQnLNlECmFrqr77fsEujL0MrjVpN0L9+Ir80h44r59w3vyeN6nx0R+PkSc3T DCCTBFu72D/lGA39IkG6w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1727046286; x=1727132686; bh=KayNk14xkBuPF M1yAz9i90vpTdlvLmL/1FOVcEEeJfk=; b=ddI+zWVukliUY6xGW2qTBZMJk19+0 16Gdz6WTl0b2j8eMv7mwYtxbQ26EN7wdeT3rFMMdo38elP5VA9d4XfQoiugAWjhk tuo9gVXa3EP/zLJhI4kMK9RmrMhtRgsPE+gdvxgiXTgS6B5rTNpJ+xi9NVMCMLa6 Bxw1XpoSD3A8XUV9Zuy1j+QQDMps7huhoURiZAgUdGneDRFqxGa1THw9Bxy2+kLT 3tzN8zBEd1qEDvIPbX2k12sryMEJGz79dBMoEHQRobgRu42P8see5rQEvXGjPEWB u50ZrA8B7T78rCQrnSDoaHfpiEVrbD9e1HmVL0Zy5ECCgt4sxPpxqBNog== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelkedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpeellefgffefiefgleetudeliefgjedvteeugffghe fggfeivefhvdevfeeftdeljeenucffohhmrghinhepghhithhlrggsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 19:04:45 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v10 4/9] gnu: Add cppgir-for-telegram-desktop. Date: Mon, 23 Sep 2024 07:04:03 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher , Vivien Kraus Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/glib.scm (cppgir-for-telegram-desktop): New variable. Change-Id: Ib9ca3bd376f32d13939adabd2c52e1eb24e2ddcb --- gnu/packages/glib.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a479199cdd..a15a7ce58a 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1621,3 +1621,22 @@ (define-public cppgir introspection annotations into a set of C++ files defining suitable namespaces, classes and other types that together form a C++ binding.") (license license:expat))) + +;; telegram-desktop requires a more recent version of cppgir +(define-public cppgir-for-telegram-desktop + (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") + (revision "0")) + (package + (inherit cppgir) + (name "cppgir-for-telegram-desktop") + (version (git-version "2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fa9nf4yljfarihaqj5kd98yysrky7q316mh6l5b1rq39ga15k9b"))))))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 19:05:23 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 23:05:23 +0000 Received: from localhost ([127.0.0.1]:42921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVdq-0000ve-Ju for submit@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:22 -0400 Received: from fhigh2-smtp.messagingengine.com ([103.168.172.153]:60131) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVdk-0000uZ-LQ for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:16 -0400 Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfhigh.phl.internal (Postfix) with ESMTP id 5764A11400D4 for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 19:04:49 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Sun, 22 Sep 2024 19:04:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1727046289; x= 1727132689; bh=4VZSxwnGY/koEx83zW/rTcyIAmjQbDiHKNmiT3D9gCw=; b=o 0FkcytzemxA7Z88IWI+cmW4k0hGRHg448xZaEB/qLTwi8BfQuIr4GbgIDvAnvyOa ziA8teul60TYDqNoE/o8HcvQFgTA9BMYbjIQGPyVXPru6dvMtezAc15Oww2JiiXU 0FwhdEA6l2OA4UZMwznxsa9RXBUoh7lJMvsxBVZSrMRyekH7XCGnL7XCOcvxw2Jq MuSsNUa6lkIE0uBoVBB8yqmR9olmDaHyXQNAI2UNx0nHwflYvks+covjIIjnImAc eu2aAGPHmEGUuYB3Sa+kX66RLaKCQMH81GRHkVKomfmrfQPPuOq97RvSqdlCjpAK x4DvbyfKZ7MelyHvWZmWw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1727046289; x=1727132689; bh=4VZSxwnGY/koE x83zW/rTcyIAmjQbDiHKNmiT3D9gCw=; b=oHZ4LttLXdTVnAOgF44JZRoYG2BOj C0hpCpp+TLp9KkLF4VYDy/A8v20aNoZXGnyBnddzUKMpgXI0Awk87CAl0B7Bfa7B r51ESuJyDjfY0C7eGmMe2b624ZILsj7aWYoY2WvlNGZGk9Rqmpu0mjnN4WvNG/KJ b0Eo1PB67zKeop4ZWmsHIv5yiwfLBJwAAQ4zB0RI/rRmYwF5vvRAC564qDQ9YqwO HMTKzcl+WQjc96m91VLnSQ9FD+r6PDsM5foJ69LlSZJyLBLr/PLdIxFKntiw3rKk UlfdxK6FtlfFqPM9fa5ZKqt6+9qISDIKeglmB5J9hIGFBi+KQd4tTh5wA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelkedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpeeffffftdehteetvdelieehgeehtedvteethefgte eivdetgeegtdejtdduudeludenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhep mhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgtphhtthhopedupdhmoh guvgepshhmthhpohhuthdprhgtphhtthhopeejudekleejseguvggssghughhsrdhgnhhu rdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 19:04:47 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v10 5/9] gnu: simdjson: Update to 3.10.1. Date: Mon, 23 Sep 2024 07:04:04 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/cpp.scm (simdjson): Update to 3.10.1. Change-Id: I6711077e162bcfbf6702d521fdeec44e3b21f074 --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7d782c7ea6..c805dae825 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2395,7 +2395,7 @@ (define-public python-jsonnet (define-public simdjson (package (name "simdjson") - (version "3.1.0") + (version "3.10.1") (source (origin (method git-fetch) (uri (git-reference @@ -2404,7 +2404,7 @@ (define-public simdjson (file-name (git-file-name name version)) (sha256 (base32 - "0q784bm8xbz3p782dw02cdds6m71wk3acy94vva8krc9g88142ws")))) + "1qv7lvls7x9aw6mlnwfgchbajsxh6qygp09wpkb2w6mjdbidmi0h")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; tests require downloading dependencies -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 19:05:23 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 23:05:23 +0000 Received: from localhost ([127.0.0.1]:42923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVdq-0000vn-V6 for submit@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:23 -0400 Received: from fhigh2-smtp.messagingengine.com ([103.168.172.153]:37763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVdo-0000v9-D9 for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:21 -0400 Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfhigh.phl.internal (Postfix) with ESMTP id 16D7611400FA for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 19:04:53 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-05.internal (MEProxy); Sun, 22 Sep 2024 19:04:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1727046293; x=1727132693; bh=qouHn1LDvqtZWfoZaeWOv54p+8QIjMLcHMj8AlyLjWw=; b= 0mNnvbbgbJsl7fOBGdsTomFs2BbefWwoMAQ3YcZrxZGc8ZIrtOmIV0Whs3VLgxBU ltIcWbdFWWy6INfI7Bj6o/YV1kEEnwgiEy0lLSyEfcFfZYuO394ZawayEK64hj80 gXvUNfl5ZQYPnXrVYDJ8fG1eIbzyznNq78FHszxvzoPXCnTV5n7jxrn9FNOgMKys Rhl9I4sQWs4e9EGUTecPNFmUPwiDBM8eMtAXoMTT548uQZMVh5xc/PEZtGG2UeOQ jgj0efmvAOfuUNmNbpm03ac1Rz8TacKBbeeR3nqwKjxZCCzscYoJ3Jn1RGTMfMqc QWTI0OY9ueoNSWpK1biRlg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727046293; x= 1727132693; bh=qouHn1LDvqtZWfoZaeWOv54p+8QIjMLcHMj8AlyLjWw=; b=j d55WjDyK6/gGgmDQXeyc3STDi2pe8+NUl8VdSuKD3Pi2PL8tlZFt1avqr+XNp6VZ Ihx++VkBX2ttfxvmtWlX+sw1vWF0SpnQcl/ur4CRQIMghrrJ2IW8kXHuhw7Qi8Oe NGhzewrEpV4O5hGaQMOcHJvQkyFAvLHSwED1u0lr3PpBbWoJ62RiA0yuPztuno6M 9MXF7TtB4SZWIKxP/e86PAZ9Uh6MjCiQsY1E/FM5bNpT122HRaDavzS8w5DJdHJU kK1BeYiqg19Ico0glY37ojRKid58B1OYtPATJYHEO9KEoemn8kIvgDUGzl606QPf uA1JiVMbjBmKDQBfwrRJA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelkedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgr mhgvsheqnecuggftrfgrthhtvghrnhepkeegvddvtdejtdeuvddtffehheegkeevkefhte fffeekledvvdeigeeggfekledunecuffhomhgrihhnpehgihhthhhusgdrtghomhenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrd hgrghmvghspdhnsggprhgtphhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphht thhopeejudekleejseguvggssghughhsrdhgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 19:04:51 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v10 6/9] gnu: Add cpm-cmake. Date: Mon, 23 Sep 2024 07:04:05 +0800 Message-ID: <499af047b20d2096a446aa30fad8cd1969701209.1727046228.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/cmake.scm (cpm-cmake): New variable. Change-Id: I3938f1da1513010c8af6bedc2aa26635d43ca7ce --- gnu/packages/cmake.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 0a9e5ba907..4466c4b91d 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2021 Ricardo Wurmus ;;; Copyright © 2024 John Kehayias +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,6 +40,7 @@ (define-module (gnu packages cmake) #:use-module (guix deprecation) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system emacs) #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages) @@ -520,3 +522,26 @@ (define-public tinycmmc (description "The tinycmmc package contains a small collection of reusable CMake modules.") (license license:zlib))) + +(define-public cpm-cmake + (package + (name "cpm-cmake") + (version "0.38.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cpm-cmake/CPM.cmake") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qbbhdq6cz2y7qfyy1k11i98d13s229r3phd5y3n5maq51ky8bgb")))) + (build-system copy-build-system) + (arguments + (list + #:install-plan #~'(("cmake/CPM.cmake" "lib/cmake/CPM.cmake")))) + (home-page "https://github.com/cpm-cmake/CPM.cmake") + (synopsis "Package manager for CMake") + (description "CPM.cmake is a cross-platform CMake script that adds +dependency management capabilities to CMake.") + (license license:expat))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 19:05:32 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 23:05:33 +0000 Received: from localhost ([127.0.0.1]:42931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVe0-00013e-EV for submit@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:32 -0400 Received: from fout5-smtp.messagingengine.com ([103.168.172.148]:49035) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVdr-0000vP-OS for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:24 -0400 Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfout.phl.internal (Postfix) with ESMTP id 62F9B13801D4 for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 19:04:56 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-05.internal (MEProxy); Sun, 22 Sep 2024 19:04:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1727046296; x= 1727132696; bh=zwEgZo1C4GSt7pl+x4IOATsU44ljg+EjKhFSc72n13Q=; b=A +HcgVnXyIOHh84agqn5NJ5epXew3xBz4YnapJXEQd6zhjDGOQDlmt5jSgPEZxS54 65zgxrS+uDxlXop2M0weeVxshJmDfmc2WSEa3mr6Bgvrv4ldrzWJdU9XWy43ujs3 rMmk8s1v7YVa3VpXAiPQoFYddyeFbP8tTSkWBzc62bCMseu7XVMoyQfxPS+cWVka 5zswjrpRg06LwJM+aTG1a/HSl/ueYU4tL0gbV7Ud9mRUclpWSU3i8LWRVlBFrR7S UWCfJlatWdlHBTqRb9bWyTJitMJcg23owvN7Gqh638hIY9sv64yEhm1XTv2QVPUs nnKLmVnRpGrJqjPUAz/Ww== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1727046296; x=1727132696; bh=zwEgZo1C4GSt7 pl+x4IOATsU44ljg+EjKhFSc72n13Q=; b=I7lPHmuDp7Dedaqh4AsNNm/oMdGqm r3nyRMqWy0nw5P4+etMXm7pMxx4u7GSRIbO0htaZGp9rqq30HPtiHoBepHlxN1lx qkj3kzk9lDeZ6MiN6tQEdjQKkka0LEnAcfmfGXHdZW8XAamDn6VYFsLz3bmtc6Qf MCBtE/88QDnTOQM8suBUu3zjZgZqozA6vfEfQ6W3LUczGCetPcN58VF0BLwO910t RORv+90/wuHKAVn7lq8Ym/u9qGa8MMdePbjhkp51PrhwNTsCFaTjyjUMcFhPr/xJ ux16f40D/RyVG+l9ZohT7Mt7eryLCcLi/GIzIgMaMIIUqFS9J1QbDu0Iw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelkedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpefhjedvfeekkefhheeiveeuueeftdejveejleeute eludelgedtueetfefhudeuvdenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 19:04:54 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v10 7/9] gnu: Add cpp-ada-url-parser. Date: Mon, 23 Sep 2024 07:04:06 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/cpp.scm (cpp-ada-url-parser): New variable. (cpm-for-cpp-ada-url-parser): New variable. Change-Id: I0b61c3b136e2781774c6a5e67eeb6b662e97dd88 --- gnu/packages/cpp.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index c805dae825..187c0d4b45 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -3284,3 +3284,60 @@ (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 cpp-ada-url-parser + (package + (name "cpp-ada-url-parser") + (version "2.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ada-url/ada") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xvvjlia627ajl966gdxzy2b1j0jiimx7zx8ypmffwx0k6x72qam")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "-DCPM_LOCAL_PACKAGES_ONLY=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-deps + (lambda _ + (substitute* "CMakeLists.txt" + (("cmake/CPM.cmake") + (string-append #$(this-package-native-input + "cpm-cmake") + "/lib/cmake/CPM.cmake")) + ;; We force CPM to find system packages rather than using git + ;; to download them. + (("Git_FOUND") "TRUE") + (("(simdjson@)[0-9.]*" _ simdjson) + (string-append simdjson + #$(package-version (this-package-native-input + "simdjson"))))) + (substitute* "tools/cli/CMakeLists.txt" + (("(VERSION\\s)[0-9.]*" _ a) + (string-append a + #$(package-version (this-package-native-input + "cxxopts"))))))) + (add-after 'patch-deps 'python-zipfile-disable-strict-timestamps + (lambda _ + (substitute* "singleheader/amalgamate.py" + (("zipfile.ZIP_DEFLATED") + "zipfile.ZIP_DEFLATED, strict_timestamps=False"))))))) + (native-inputs (list cpm-cmake + cxxopts + fmt-10 + googletest + python + simdjson)) + (home-page "https://github.com/ada-url/ada") + (synopsis "URL parser") + (description + "Ada is a fast and spec-compliant URL parser written in C++. +Specification for URL parser can be found from the WHATWG website.") + (license license:gpl3+))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 19:05:33 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 23:05:33 +0000 Received: from localhost ([127.0.0.1]:42933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVe0-00014a-RL for submit@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:33 -0400 Received: from fhigh2-smtp.messagingengine.com ([103.168.172.153]:57765) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVdu-0000va-Mu for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:27 -0400 Received: from phl-compute-07.internal (phl-compute-07.phl.internal [10.202.2.47]) by mailfhigh.phl.internal (Postfix) with ESMTP id 627A211400D3 for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 19:04:59 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-07.internal (MEProxy); Sun, 22 Sep 2024 19:04:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1727046299; x= 1727132699; bh=CGfP3BtmV5YLyvohOIZZ0SMwXg32uckWwX0jKdo3zCs=; b=d tGcqp/etdYAlpz/PWaRVnTQ4hyY5OiG3+T40G22TkGnFsQzcQGwHiDv8pU3cyVP8 lSPj563x8r1RtDw8a2nQOuaHCkJUyZ9nIzuE2mJtGcGVqWtimvvpHlZ4HtQU7G5M 9A4gocbXMS0+gXlxZ/LzGPwDwrM4kVEV+j6Q3f35F/CJDkJi+i8dMoCmKJnnZ0vj eftt6rCw7BRmb+fBpMHd9UT35MItA48SKY/r+aqPZ0RZ+LHFk75Hpka4M8YzsRDb 5mH3NcFOlGOns8jVjLlWYtSdA92cGGXWSu4t2X/bolYgX3ujvqI245QwnJPbtmyw kLl05idOlNfgUd5Zz2zmg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1727046299; x=1727132699; bh=CGfP3BtmV5YLy vohOIZZ0SMwXg32uckWwX0jKdo3zCs=; b=nZx1p8V3Fms3OuNjhUhNeH8oQ/NRv ehpTNN9WeTDXiIkLJyIlMxpalgOLNaDSDeJLN/xR5nTnM4KSbITxvGTmxeW35Xwu U660sHP3sfnhyD0PnkeQDSabUZrQzDFU+lLE0QzmD7VIX2gtvnZQVAsXQKsHEeG1 eIYtXxCpA/dV51cioFtEqHKdCkff5jYGT3MUiBCMQEyhEIGsS+ccSw53T1rcj2MK hFqysezJBwp9txZAzYR0D9ET0pCePqDccbK6Af10/pRnnWDm1ZyIUtc6TxJwC6hQ wqbLOYNKUNS3swamvXBWgZzrqeDGbpItt5TkjY3Ad+FqCBBTbodqjApqg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelkedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpefhjedvfeekkefhheeiveeuueeftdejveejleeute eludelgedtueetfefhudeuvdenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 19:04:58 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v10 8/9] gnu: Add libprisma-for-telegram-desktop. Date: Mon, 23 Sep 2024 07:04:07 +0800 Message-ID: <031ba0621d99be57d5b7f592322da46bb7c5cbea.1727046228.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/telegram.scm (libprisma-for-telegram-desktop): New variable. Change-Id: I855b463993654a8cad491c7b56c9581b3083f5e4 --- gnu/packages/telegram.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 432d6f79a1..af16d4840b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -400,6 +400,18 @@ (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 "23b0d70f9709da9b38561d5706891a134d18df76"))) + (file-name + (git-file-name "libprisma-for-telegram-desktop" "5.3.2")) + (sha256 + (base32 + "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) + (define-public telegram-desktop (package (name "telegram-desktop") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 19:05:40 2024 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 23:05:40 +0000 Received: from localhost ([127.0.0.1]:42935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVe7-00014w-8g for submit@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:40 -0400 Received: from fout5-smtp.messagingengine.com ([103.168.172.148]:40095) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssVdy-0000wC-5a for 71897@debbugs.gnu.org; Sun, 22 Sep 2024 19:05:32 -0400 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfout.phl.internal (Postfix) with ESMTP id D008513801D4 for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 19:05:02 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Sun, 22 Sep 2024 19:05:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1727046302; x=1727132702; bh=sd8otTg1DPqYy5o+NCMcqMN7H4uFqsB4wkSsRVypYsk=; b= bToXA6WFEMIa+5B0mmy27wlV/alwkB29JJH34BbIx+dkFNIxH+iepYO33gdwlC1v E796uPNfrnXWmLLd4FQOnK2JH57aDviqrpwkQ4X8wOwG+JJqYIl3gTBXXdnvZuLa PvesQngRuM0N3u5F0VH0s+eTk7PYXAKfyCF/2mvXQe3EYfNuk+9MJmNTAoMsN1i0 Y1XtO7GhdsMl2a2D/rOrQLYFH/LlAShk0iPQp7OIJ39fwyrCWczkF+nEZVMlCoWr aczMMFRtm4mKzCPkTpiJ499d9UJx7WlXfAMxcqdDNRp9hWVFLzpuD+rU2rIpYwJ9 NC7tIaUfCoeRPRx3sWRNtg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727046302; x= 1727132702; bh=sd8otTg1DPqYy5o+NCMcqMN7H4uFqsB4wkSsRVypYsk=; b=b 7qt8wGfFB+/Tu+u4PUzw6345lSQ4qxPd/1W1OteAhmEZzfH7mQ2AXileR+n+yFPi M6cYW40jKxPsoQuvYqHdfRe5aWpgVigvqV3Q78jNNeZLEH7HtE7I/q78kn1iF2Zo 9904G+72BFTNUaah7qrQVE6Ddau0oJOURJjlOEv/qTGnNWZT4EaH2U7sXp0jGwAx qWdM2bL2B42VuzvYirAhH1JNzmMdgJ81H4CbJlhc3GoOz+QkFH27HoW6KM8fLIL2 DvETCQiim5Ja/E8SCvE1UvxnognGsl32OjKVUnsWfLQ0oLd/2JebERcvd8xEKFLx PMauA4d6zEzT/K0B9t4/g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelkedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucgfrhhlucfvnfffucdlud dvmdenucfjughrpefhvffufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpegu rghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghrnhepieekuedvtdevle egheduheelheetfffhhfffhfdvveegveekhefhffeiueeigeeinecuffhomhgrihhnpehg ihhthhhusgdrtghomhdpkhhithifrghrvgdrtghomhenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgt phhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejudekleejseguvg gssghughhsrdhgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 22 Sep 2024 19:05:01 -0400 (EDT) From: dan To: 71897@debbugs.gnu.org Subject: [PATCH v10 9/9] gnu: telegram-desktop: Update to 5.5.5. Date: Mon, 23 Sep 2024 07:04:08 +0800 Message-ID: <5ca5900e91a9d6b877a05fed40fc334d3931da24.1727046228.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71897 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: Update patch file to match upstream changes. * gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch: Update patch file to match upstream changes. * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/telegram.scm: (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)[origin]: Add patches to unbundle gsl and cppgir. (libprisma-for-telegram-desktop): Use %telegram-version. (telegram-desktop): Update to 5.5.5. [:configure-flags]: Add disable jemalloc flag. [#:phases]: Add libprisma-for-telegram-desktop. : New phase. : New phase. : New phase. [native-inputs]: Add cpp-ada-url-parser, gobject-introspection and xdg-desktop-portal. [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite and remove jemalloc. Change-Id: I0ea3ea5a3e416a9d5b2b5b7b55ca1af679bc3d38 --- gnu/local.mk | 2 + ...gram-desktop-allow-disable-libtgvoip.patch | 6 +- .../telegram-desktop-unbundle-cppgir.patch | 95 +++++++++++++++ .../telegram-desktop-unbundle-gsl.patch | 31 +++++ ...or-telegram-desktop-unbundle-libsrtp.patch | 7 +- gnu/packages/telegram.scm | 112 +++++++++++------- 6 files changed, 205 insertions(+), 48 deletions(-) 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 802f4be4fe..dc6c7294e7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2196,6 +2196,8 @@ 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-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-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch index a603bc9d72..1354a1e9cd 100644 --- a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -47,10 +47,9 @@ diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/ca index 5fe9ac677..bebf48e70 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp -@@ -39,8 +39,10 @@ class InstanceImpl; +@@ -39,7 +39,9 @@ class InstanceImpl; class InstanceV2Impl; class InstanceV2ReferenceImpl; - class InstanceV2_4_0_0Impl; +#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP class InstanceImplLegacy; void SetLegacyGlobalServerConfig(const std::string &serverConfig); @@ -58,10 +57,9 @@ index 5fe9ac677..bebf48e70 100644 } // namespace tgcalls namespace Calls { -@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register(); +@@ -56,6 +58,8 @@ const auto Register = tgcalls::Register(); const auto RegisterV2 = tgcalls::Register(); const auto RegV2Ref = tgcalls::Register(); - const auto RegisterV240 = tgcalls::Register(); +#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP const auto RegisterLegacy = tgcalls::Register(); +#endif 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..a24dbe25bb --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch @@ -0,0 +1,95 @@ +From a5c42e07ae223d440ff11347e0cf1fd58fd383df Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 1/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/CMakeLists.txt | 4 +++- + external/glib/generate_cppgir.cmake | 7 ++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt +index 3c6fe4be..c862705f 100644 +--- a/external/glib/CMakeLists.txt ++++ b/external/glib/CMakeLists.txt +@@ -13,9 +13,11 @@ function(add_cppgir) # isolate scope + set(BUILD_EXAMPLES OFF) + add_subdirectory(cppgir EXCLUDE_FROM_ALL) + endfunction() +-add_cppgir() + + include(generate_cppgir.cmake) ++if (NOT CppGir_FOUND) ++ add_cppgir() ++endif() + generate_cppgir(external_glib Gio-2.0) + + find_package(PkgConfig REQUIRED) +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index c15d3f9e..9b0a5ac8 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 2.0) ++ + function(generate_cppgir target_name gir) + set(cppgir_loc ${cmake_helpers_loc}/external/glib/cppgir) + +@@ -17,6 +19,9 @@ function(generate_cppgir target_name gir) + ${cppgir_loc}/data/cppgir.ignore + ${cppgir_loc}/data/cppgir_unix.ignore + ) ++ if (CppGir_FOUND) ++ set(ignore_files) # rely on default ignore list ++ endif() + + set(gir_path) + if (IS_ABSOLUTE "${gir}") +@@ -33,7 +38,7 @@ function(generate_cppgir target_name gir) + --class + --class-full + --expected +- --ignore ++ "$<$:--ignore>" + "$" + --output + ${gen_dst} + +From eed39522952c15f448c54290454806dd011c4996 Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 2/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/generate_cppgir.cmake | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index 9b0a5ac8..2ad82277 100644 +--- a/external/glib/generate_cppgir.cmake ++++ b/external/glib/generate_cppgir.cmake +@@ -15,11 +15,12 @@ function(generate_cppgir target_name gir) + + set(gen_timestamp ${gen_dst}/${target_name}_cppgir.timestamp) + +- set(ignore_files +- ${cppgir_loc}/data/cppgir.ignore +- ${cppgir_loc}/data/cppgir_unix.ignore +- ) +- if (CppGir_FOUND) ++ if (NOT CppGir_FOUND) ++ set(ignore_files ++ ${cppgir_loc}/data/cppgir.ignore ++ ${cppgir_loc}/data/cppgir_unix.ignore ++ ) ++ else() + set(ignore_files) # rely on default ignore list + endif() + 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..f89d326a5c --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch @@ -0,0 +1,31 @@ +From a3ac6df0441b4caca28b1df87febc420e18942ce Mon Sep 17 00:00:00 2001 +From: Zephyr Lykos +Date: Mon, 23 Oct 2023 15:55:24 +0800 +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 8eaf19c5..344f9488 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) diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch index 486f0b1aa5..3317d0a9c1 100644 --- a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch @@ -17,10 +17,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index af7d24c21..66bec8fdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2647,6 +2647,9 @@ if (TG_OWT_USE_PROTOBUF) - list(APPEND export_targets proto) - endif() - +@@ -2647,5 +2647,8 @@ if (APPLE) + libyuv + ) +if (LIBSRTP_FOUND) + target_compile_definitions(tg_owt PRIVATE HAVE_LIBSRTP) +endif() diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index af16d4840b..084b14088a 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2023 Lu Hui ;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; Copyright © 2024 Ricardo Wurmus +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,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) @@ -44,7 +46,6 @@ (define-module (gnu packages telegram) #:use-module (gnu packages gtk) #:use-module (gnu packages hunspell) #:use-module (gnu packages image) - #:use-module (gnu packages jemalloc) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages language) #:use-module (gnu packages libevent) @@ -82,11 +83,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 "5.5.5") (define libyuv-for-telegram-desktop - (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") - (revision "2439")) + (let ((commit "04821d1e7d60845525e8db55c7bcd41ef5be9406") + (revision "2440")) (origin (method git-fetch) (uri (git-reference @@ -97,79 +98,84 @@ (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 "05a7db2e2d2a59ecf42483debca4944d09154b5b"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) + (patches + ;; https://github.com/desktop-app/cmake_helpers/pull/320 + ;; https://github.com/desktop-app/cmake_helpers/pull/305 + (search-patches "telegram-desktop-unbundle-gsl.patch" + "telegram-desktop-unbundle-cppgir.patch")) (sha256 (base32 - "0y96mvzs113zh8bdw1h3i6l0pgwg93rigrday8kfdg4magz686k6")))) + "1gapyk5a8rsl8vigbz0l8h9858f2lkhkd2pjy72zivp0mrq8w0hr")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "1a969faa0afb29d53af03e530775eccdfb8433f1"))) + (commit "0af136124083369073b8fdaf45f0816fd2b10bad"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1xmw8dfm51p5g20rlmzqnr72a14ngyxwq09an8clf1v5s6mmwvak")))) + "057bwn9smrgnyfb1vraf50ihbkhjc4d72msl7vnbqc4h5sg8dav9")))) (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 "547e7f2914d9b5548dd17e70a3a7bf5d6606afc3"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83")))) + "0sgm2prhd4fw89afh62k7i4i7mj60n170kqz50b0mad927zngxvn")))) (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 "c1d6b0273653095b10b4d0f4f7c30b614b690fd5"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "06mzafnjpfr5ih297dh7bxm6bgpg0wy0gv2r2732n5szyrg9sdl6")))) + "1sxn3qccsfbx1289z0fdrb4cggs16a8r75ic6wi81c6lnkrdi3wl")))) (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 (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_qr.git") - (commit "501f4c3502fd872ab4d777df8911bdac32de7c48"))) + (commit "6fdf60461444ba150e13ac36009c0ffce72c4c83"))) (file-name (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) + "1i5n3qvjkf4nv8k75cc0a71xyvpklc4nzg4k2zsfr2pxk0cy7hkw")))) (define lib-rpl-for-telegram-desktop (origin @@ -188,88 +194,88 @@ (define lib-spellcheck-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "ae89fefd239ecc47d4dab7ba29f9e230376a57d3"))) + (commit "e76981e133a1d29f3ceb557f53850a8d822f439a"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "147xbbcza5q4wcdipk5jplajzkc48971kg2s7qv5jlz33sxkw1lq")))) + "0dslsy3d6gmxaj6yv49zjgl2b2mh75j7fpnbynglr02h3m2fdj96")))) (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 "ccdc72548a5065b5991b4e06e610d76bc4f6023e"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) + "0b11ix95dzpkz335q0a6b5yg8qhj33s4fgj9ppl37pszcqq1j3wi")))) (define lib-tl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_tl.git") - (commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa"))) + (commit "237cbeb9d1c637759f89a508c1d854caf16e1984"))) (file-name (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk")))) + "1ji3gypy4yf9knsgylnyz5gc2kii7lls5ymj1rkf0daixdz931cm")))) (define lib-ui-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "37531086ec21a8569deddedb11b402f8a3157b90"))) + (commit "c4e3a08e6fb90a6174c8b592d9eb747dd4d3f9c5"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0")))) + "1lbfy4fbb52lklfwn6kxny3mwl653r4vc80k922kwjfgbcy9c25f")))) (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "b68a95ad4d1ae9a1827671100a7fd76cbe448c3f"))) + (commit "8751e27d50d2f26b5d20673e5ddba38e90953570"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1c8jwdnn26n13yp0rp0l71q6xlxa6wp3cspbm3pnghw964jwgp3z")))) + "0f05pqb83qckghzlhnwqbi9qfi9xw7qsv8jampl4qyaq9q0w9p20")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "f632fc84cbc62ae8abbbd05f81d472757a337c11"))) + (commit "2de655f58dc327e40d5d9df71300a0d0fdb39c9f"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i")))) + "12vrif0685vb068mj5sd7cknav1n66jysp18j21nlp0am9pw7ydj")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "2e2797648aac2588e7fe479c2e8b4455ec65c5e6"))) + (commit "9bf4065ea00cbed5e63cec348457ed13143459d0"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) + "1p563a11w8jrid96xf03dg6j39ciz28n5f4r6g28lxhiphbqzfym")))) (define-public webrtc-for-telegram-desktop - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") - (revision "389")) + (let ((commit "c425281150317753d7bc5182c6572abe20f9a784") + (revision "456")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -285,7 +291,7 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) + (base32 "1fj48iq56awnrckncy1qc3zhdzifl725hbb6an7wg2v3zmagvrwn")) (patches (search-patches ;; https://github.com/desktop-app/tg_owt/pull/123 @@ -407,7 +413,7 @@ (define libprisma-for-telegram-desktop (url "https://github.com/desktop-app/libprisma") (commit "23b0d70f9709da9b38561d5706891a134d18df76"))) (file-name - (git-file-name "libprisma-for-telegram-desktop" "5.3.2")) + (git-file-name "libprisma-for-telegram-desktop" %telegram-version)) (sha256 (base32 "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) @@ -427,7 +433,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) + (base32 "12fdybn085s3i3a8hwi0bmdns7jxvg0k662n04jgffirgsz8n54m")) (patches (search-patches ;; https://github.com/telegramdesktop/tdesktop/pull/24126 @@ -468,7 +474,10 @@ (define-public telegram-desktop "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" - "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON") + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + ;; Enabling jemalloc causes SIGSEGV. This probably happened + ;; after upgrading to glibc 2.39. + "-DDESKTOP_APP_DISABLE_JEMALLOC=ON") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'unpack-additional-sources @@ -493,21 +502,45 @@ (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 'unpack-additional-sources 'use-system-xdg-desktop-portal + (lambda _ + (substitute* (list "Telegram/CMakeLists.txt" + "Telegram/lib_base/CMakeLists.txt") + (("\\$\\{third_party_loc\\}/xdg-desktop-portal/data") + (string-append #$(this-package-native-input "xdg-desktop-portal") + "/share/dbus-1/interfaces"))))) + ;; Remove this constexpr keyword to make it compatible with gcc-final. + (add-after 'use-system-xdg-desktop-portal 'patch-libwebview + (lambda _ + (substitute* "Telegram/lib_webview/webview/webview_interface.h" + (("constexpr ") "")))) (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 (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list `(,glib "bin") + (list cpp-ada-url-parser + `(,glib "bin") + gobject-introspection `(,gtk+ "bin") pkg-config - python-wrapper)) + python-wrapper + xdg-desktop-portal)) (inputs (list abseil-cpp-cxxstd17 alsa-lib + boost c++-gsl + cppgir-for-telegram-desktop crc32c + expected-lite fcitx-qt5 fcitx5-qt ffmpeg @@ -516,7 +549,6 @@ (define-public telegram-desktop gtk+ hime hunspell - jemalloc kcoreaddons-5 kimageformats-5 libdispatch -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 24 02:00:49 2024 Received: (at 71897) by debbugs.gnu.org; 24 Sep 2024 06:00:50 +0000 Received: from localhost ([127.0.0.1]:45099 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssybR-0001uU-K6 for submit@debbugs.gnu.org; Tue, 24 Sep 2024 02:00:49 -0400 Received: from mail-pl1-f169.google.com ([209.85.214.169]:58774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssybM-0001u7-2s for 71897@debbugs.gnu.org; Tue, 24 Sep 2024 02:00:48 -0400 Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-206aee4073cso54872985ad.1 for <71897@debbugs.gnu.org>; Mon, 23 Sep 2024 23:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727157554; x=1727762354; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=mf0Nch0uHlewuQRgXlnzFjXxKYLuIrr6v085uBCZE1Q=; b=DJcy2l6QM6Rtob5tJUMVGdYnWqNJP41AAW2qM+q0I8jfe7NwhSrHFeXkDnTa8nrSjQ TlX1XaSrrj505LrfnQx1ZQ7LG5YwO1L2llKoSSoOhvDGRk2h1Fr6mlH/K0Dl2oL2jiAP 4Wq+tLqjjid8iKD3E4cutps2HpXhnga1+8u+nUXH3FPax1BdlN/frxdEMp//qcPINn2X kYlB3fqUPMIB1m+rigrTkwqvK7f1T/ZbQmferasReRxs0bQHuVR/De405l3+khya2iRZ f/VH2QOW1G0myF67Jb6k7xz+aB69XnM0n9qCksfKWR+y4uLaNixTdnz7LSBTKSEs0qj7 9v1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727157554; x=1727762354; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mf0Nch0uHlewuQRgXlnzFjXxKYLuIrr6v085uBCZE1Q=; b=beq44oVPBHESp0hgNvLhG1usbLNcz7dppehNJ+fNluCTwR4SHiiHfe2mfbQArmJjW3 9B9p3GOy62kd/Vltw2aQ9fUZbHGlEBbSr91VjnNAT6ojdaZrf0viHb3xrzL/h0VAqv3D eeKHX3hKXSgRDeQvPnW/Si6tPQGseIYlH8DjAGwu5FQskJjn7xCAsatQaygyvL4QvxdO oACV0f2zphok9W1dISYfzRqfKkiXmlXankjCEbU6sQjKf8L+Y3ap8Emm4jsE97GzWMMQ Kz452UHNezf/tbsArO6rNq0KgUUpCgc1pgHylY7NI1Dkr8aGC9oihbrwNIX1qBrLWOz6 +fAQ== X-Gm-Message-State: AOJu0YyCw2qJ0I2ih+w+gT564+HKj3FXXT3rPH9jhzzM/xYclnUYtcac XpkCy0tgRsPuJlWbOl2JIJtGhKI6Wxs8daYqnvaey5fuF14ez816 X-Google-Smtp-Source: AGHT+IEU2jZalLLN4J/kANB0c8apuWQ2TMCMv15s9NphlwhSesxbl2LkNCCR+CjU3WgyCaiRCOlNUg== X-Received: by 2002:a17:902:e5cf:b0:1fa:9c04:946a with SMTP id d9443c01a7336-208d97e3f62mr183850745ad.1.1727157553984; Mon, 23 Sep 2024 22:59:13 -0700 (PDT) Received: from hurd ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20af1818bedsm4144425ad.195.2024.09.23.22.59.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2024 22:59:12 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH v8 8/8] gnu: telegram-desktop: Update to 5.5.5. In-Reply-To: <87cykwl3yj.fsf@dan.games> (dan's message of "Sun, 22 Sep 2024 12:14:44 +0800") References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> <87o74gl6dp.fsf@gmail.com> <87cykwl3yj.fsf@dan.games> Date: Tue, 24 Sep 2024 14:59:09 +0900 Message-ID: <87y13hk2xe.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Sharlatan Hellseher , Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Dan, dan writes: [...] > The upstream pull request URLs were added as comments in the package > definition. Do you think this is sufficient? Or do you suggest me > adding them in the patch file directly, or in the commit message? I'd suggest adding the source 6formation in the patch files directly; I think 'guix lint' looks if there's some comment/url there, and it can't be missed when looking to update the patch. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 24 02:01:49 2024 Received: (at 71897) by debbugs.gnu.org; 24 Sep 2024 06:01:49 +0000 Received: from localhost ([127.0.0.1]:45103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssycP-0001wd-05 for submit@debbugs.gnu.org; Tue, 24 Sep 2024 02:01:49 -0400 Received: from mail-pl1-f182.google.com ([209.85.214.182]:56783) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssycN-0001wQ-M0 for 71897@debbugs.gnu.org; Tue, 24 Sep 2024 02:01:48 -0400 Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-205659dc63aso42492515ad.1 for <71897@debbugs.gnu.org>; Mon, 23 Sep 2024 23:01:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727157618; x=1727762418; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=3j7YBvBz1liwise/yHUzPFskxHHuci0z5yVfjKacuSw=; b=FypDWB0DwUL9IhTM76Sz1d3njUvmZZPnmWpCOElBzvDZWFrIi3J7fstgmGfyVSfZlM 83g8BwQvE3NOcvmEqWuQR8Q3KMfQ/PftD/Hf+BhqPK/7TqQ6HQxu5qJ+3rTx161Tq/WQ YCp8r22KgVvLXS9SL9a57c+q1SYFsOJl8oR4XuwEOj4LCLIBWeuhBoCHaEAWex7MMTMX ZGtTOoj5QK18Iawi77ubYAsNhJnnV3sGYdnKmMaTwO3Vp0aUXl+uCnWHaRcA10nHEHqb RQDWJc8MH0NYn5X2JC3iwafEkiiMNfDYA0hmIEpLWjNdR/5G+YRHBW6bdloWhVkhkCRK us4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727157618; x=1727762418; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=3j7YBvBz1liwise/yHUzPFskxHHuci0z5yVfjKacuSw=; b=YnfL9Mf+kn3p9lFHyO3LdcfDDguVAzhgtUMSiBFDlL+SVPZStdthNxEyVqwaSQKszA rJcxUc9fsxzOj82OP6QtiCkLq7HlA9Dv2v9C5egf7OBnVaFRIbPxLJ5j8WeHNWzOImwP 1R7XXzmL6K1GtXNaptDpXgTZbfoI3Qj4tIo7sqkCF1Pv0DRBQM7piqGILzVZgOsTuP8k HQeZ2F3cRaizyMF8k1NWbjwFYHtLiUjMo5H8amj8OsSapYxC4FMUprm7ctFscLi5+9OH x0d8cALlNgVUHebCyS4hIgyzopREuuooNzPwdLnhNU6ts63FLpHRCsom3VJctJSTm3ru DyAQ== X-Gm-Message-State: AOJu0YzgeR2CnoX0369rB5z5IOHLSbyQ63a9mlHYM2oxAmp9mumTd61+ ubZTPv5HY1EpEUodj/c+kCwV3EVnyXo0wgWoeOApGvwCw2T/SNR28f5bQg== X-Google-Smtp-Source: AGHT+IGuoDVoE6OFTj/oPTAhfwUlw8yj//NXwPYMjGTUhZglzpizku6JArMsGV/SgQUYjOY92lcRZQ== X-Received: by 2002:a17:903:985:b0:209:de2e:219a with SMTP id d9443c01a7336-209de2e23a9mr117257695ad.47.1727157617869; Mon, 23 Sep 2024 23:00:17 -0700 (PDT) Received: from hurd ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20af16e064bsm4225885ad.17.2024.09.23.23.00.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2024 23:00:17 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH v8 8/8] gnu: telegram-desktop: Update to 5.5.5. In-Reply-To: <87h6a8l46p.fsf@dan.games> (dan's message of "Sun, 22 Sep 2024 12:09:50 +0800") References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> <87o74gl6dp.fsf@gmail.com> <87h6a8l46p.fsf@dan.games> Date: Tue, 24 Sep 2024 15:00:14 +0900 Message-ID: <87tte5k2vl.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71897 Cc: Sharlatan Hellseher , Liliana Marie Prikler , 71897@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Dan, dan writes: [...] > In gcc-12, the code looks like this: > > template > _GLIBCXX20_CONSTEXPR > inline > typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value, > bool>::__type > operator==(const basic_string<_CharT>& __lhs, > const basic_string<_CharT>& __rhs) > _GLIBCXX_NOEXCEPT > { return (__lhs.size() == __rhs.size() > && !std::char_traits<_CharT>::compare(__lhs.data(), > __rhs.data(), > __lhs.size())); > } > > Which indeed has the constexpr. > > But as I explained in previous reply, I failed at using a newer > version of gcc. Thus, I think trivially remove the constexpr from > telegram-desktop's source is the easiest fix here. I see. I thisk it'd be nice if a short summary of this was added to a comment in the phase patching out the constexpr keyword. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 26 01:26:09 2024 Received: (at 71897-done) by debbugs.gnu.org; 26 Sep 2024 05:26:09 +0000 Received: from localhost ([127.0.0.1]:42226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sth0y-0000J6-KG for submit@debbugs.gnu.org; Thu, 26 Sep 2024 01:26:08 -0400 Received: from mail-pj1-f41.google.com ([209.85.216.41]:50385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sth0w-0000IR-CH for 71897-done@debbugs.gnu.org; Thu, 26 Sep 2024 01:26:07 -0400 Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2d8f06c2459so503987a91.0 for <71897-done@debbugs.gnu.org>; Wed, 25 Sep 2024 22:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727328273; x=1727933073; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=wO4+kjk24tU0wcqNiQZynTrLlFDNinyZ94M9yIqyzUA=; b=e8J7UxiNqOs/o6glohi0jbNAfzbjZCkSw0JqV+bvCOH7Y6p4YIyKluYwuklj2Je0Ov rLosSmlPM0CZuvbBbruJSRcJKbVKXcrrgoTvUbBgHrk2S5KiODWNEhYE4e+13Kl8hLvy xqapIImctMKkkP/Tmk3eavuPylinE+uSDdc5Pn6ljjp3kqZY8+R/DffYuqJCq9VAdlh8 xM4hVVWiE8phBvKBv3/yAd2PGef2bJdPcIUf413oo/ji1pCgSKnxu54WWQY6UlgRhsha WXz1syjTvdqD/7nQHYVv5s2OCG8GBfabQHgGJSNhSV/c0Ur59TgsaYUB1pSGewGGoYvq 9XOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727328273; x=1727933073; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wO4+kjk24tU0wcqNiQZynTrLlFDNinyZ94M9yIqyzUA=; b=T/mnJh0WodnVV3KLtYcs6lryrso+xkLPhYF9TkGJVKei93ea0VFamGWTQAa9BA/Tqu xBp+KxJ4SpbfXbQ85vQp09ZuXtDw7McgVYL38UPy2zmJQUY8uQ91er8/PKMwaL03cXQ6 XctYCcP9dGp6/H2KYTlzSGHSAzc7vQo/Kbca8EJsLMoCj4vYqvT+vSP2DcpXclWgaWP5 3Lpjm7rCwmLTIpjbO16mcIe+C9yLhD4pagCQLsQgkTPUQq1noc2XtKknrJAcUZaSp8KB qpS6CLXtZFFfpH7OxapU/82+Tod8GIpNsmjzFOnj+HkZykS0Q17sGe7GTx2hM8AKyRpj GRUg== X-Forwarded-Encrypted: i=1; AJvYcCU7mNflLa3Fl7x3aY9YYqBl51hgQbunFRp3QaH7QIAzeZzdVxPHu03rJPeeO9EQIkRxsmudLEjCIi92@debbugs.gnu.org X-Gm-Message-State: AOJu0YwfKi7MxLL7PITmhtszilKzDW6EBjCXORNdPJiScXtUgiCOCDg5 nBtxaXKfHG9FWbcp4NimcbgWu643ZRB6x1L0CKzmUksc5oI5EFTvKjkFzA== X-Google-Smtp-Source: AGHT+IHUv6SgwcW7ZPRhg8pkrQCY+Jd6CVoaW9gCebQAAxMI+ygD/THT3fkZax2BQEV5zjgPaDcN+Q== X-Received: by 2002:a17:90b:5205:b0:2c9:61ad:dcd9 with SMTP id 98e67ed59e1d1-2e06afb8f0dmr5554239a91.27.1727328273034; Wed, 25 Sep 2024 22:24:33 -0700 (PDT) Received: from hurd ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e06e1af08esm2417402a91.18.2024.09.25.22.24.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 22:24:32 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [bug#71897] [PATCH v5 6/6] gnu: telegram-desktop: Update to 5.2.3. In-Reply-To: <15e484c8c6a14da7f1c487e3eea7f86a22574649.camel@gmail.com> (Liliana Marie Prikler's message of "Sat, 27 Jul 2024 17:56:19 +0200") References: <86d68b5e47edc7d9be9cceff7941087131340ffa.1720972086.git.i@dan.games> <15e484c8c6a14da7f1c487e3eea7f86a22574649.camel@gmail.com> Date: Thu, 26 Sep 2024 14:24:29 +0900 Message-ID: <87jzezgf76.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71897-done Cc: 71897-done@debbugs.gnu.org, dan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Liliana Marie Prikler writes: > Am Sonntag, dem 14.07.2024 um 23:49 +0800 schrieb dan: >> * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New >> file. >> * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. >> * gnu/local.mk (dist_patch_DATA): register them. >> * gnu/packages/telegram.scm: >> (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. > This is minor, but the ChangeLog format uses closing parentheses before > continuation lines. >> (cmake-helpers-for-telegram-desktop)[origin]: Add patches to unbundle >> gsl and >> cppgir. >> (libprisma-for-telegram-desktop): Use %telegram-version. >> (telegram-desktop): Update to 5.2.3. >> [#:phases]: Add libprisma-for-telegram- >> desktop. >> : New phase. >> : New phase. >> [native-inputs]: Add gobject-introspection and xdg-desktop-portal. >> [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite. >> >> Change-Id: I78df3434a2cd04afc54107b7fecd5e5a8df85564 > Can anyone confirm, that this patch builds? CI didn't build it and ld > died to OOM on my machine. Confirmed. I've now pushed the series and added commit 404dbd894c ("gnu: telegraph-desktop: Fix exhuberant build memory requirements.") on top, which should help guarding against OOMing in the future. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 26 01:28:16 2024 Received: (at 71897-done) by debbugs.gnu.org; 26 Sep 2024 05:28:16 +0000 Received: from localhost ([127.0.0.1]:42354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sth32-0000Pd-7x for submit@debbugs.gnu.org; Thu, 26 Sep 2024 01:28:16 -0400 Received: from mail-pf1-f181.google.com ([209.85.210.181]:53388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sth2z-0000PK-PY for 71897-done@debbugs.gnu.org; Thu, 26 Sep 2024 01:28:14 -0400 Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-7179069d029so474665b3a.2 for <71897-done@debbugs.gnu.org>; Wed, 25 Sep 2024 22:27:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727328401; x=1727933201; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=n2Cr4sHJIKKiiw++6yRPoy8mqqqEUtdVgtuiGm8sUQw=; b=g95RRvsB/kvRvfoAAckYOSWkI5mCUy9n6pxmbjzoE4NMfCG80Ges0BpBYtOhK7+3iH VMiNkuuXhMSE2N7MgFIc5UpYHRwqhMBFDW50N4Suzz4dLtX2qd0GLwZN72zPCPEyPJQ4 gbHLXgwk+k7Qg8cFGndhGqLqe3ytmjXBCsHrrhaLVCOpfP9QaTei0r94kQX0UxPgWzxJ icksx4NeI6CzdiaDoKVcEA2qVnF3JVB8Ffcqr7ikrMe07jf6RcIUYNWbG/1BB5r39pW8 Jngi6B5KKoUrkH1fmlK+qzpH5TTlDkkUbrq3FmT7itjA4/HfSUSKmbRASAtcTfKh40QR zs0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727328401; x=1727933201; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=n2Cr4sHJIKKiiw++6yRPoy8mqqqEUtdVgtuiGm8sUQw=; b=Izt6fmQ901g6WQoUA02Th7zLaySS9IC/mc4PQHIJsri+bbNXdOc8wSWmbkt785a0la 3Z+wBO8MxhdWoJ+Z9KoHyiI2uQV9h1bMIaoCtKDgYt73N0a0VKywYbS0Ugt0+acAv6Za 7jzFLqMYqzk4IP78CGnJKrhswHPWh8vfOWnP++Lt2LfNu43nrM3NxGHTvzuo6He7Kaau Cqv+4A/x83N6FO6NphiA0hpfJK9X/0gT7EoKFxwShHUNHGu9UE6c+N210QYawhv+/jf5 LTbxHwb2fcGl3so6w4m8+0ScEIyQEh9yZ6i1OdTizFSXnhyVF773VpqC/DxuM7q5iTRy LmvA== X-Gm-Message-State: AOJu0Yy8/HCHnFWvliV8N9vaPD3zDyrOG0b/YawkeuFax9ojRM7x5Te5 5a9/CSCvTR++Wk/KIyYA8bVXYqbQJ1+lL7GP6BoW/YveETikTh7i X-Google-Smtp-Source: AGHT+IF+nkIteLWl8EolnGChiEJA9gtUNsWp2xZNwEUqPLPPIeZVPQBXboUmq+W8+jEkJAhsMN+DiQ== X-Received: by 2002:a05:6a21:a4c2:b0:1cf:7123:86a6 with SMTP id adf61e73a8af0-1d4e0bbb471mr7315382637.49.1727328401344; Wed, 25 Sep 2024 22:26:41 -0700 (PDT) Received: from hurd ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71afc847924sm3523899b3a.58.2024.09.25.22.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 22:26:40 -0700 (PDT) From: Maxim Cournoyer To: dan Subject: Re: [bug#71897] [PATCH v10 1/9] gnu: xdg-desktop-portal: Update to 1.18.4. In-Reply-To: (dan's message of "Mon, 23 Sep 2024 07:04:00 +0800") References: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@dan.games> Date: Thu, 26 Sep 2024 14:26:37 +0900 Message-ID: <87frpngf3m.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71897-done Cc: 71897-done@debbugs.gnu.org, Sharlatan Hellseher , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Dan and Liliana, I've applied and built (also dependents) this series, and it looked fine. I've lightly edited the telegraph-desktop commit (moved comment inside patch and clarified the constrexpr one). Telegraph is now updated on master, with commit 404dbd894c69c94b483c6139d2a39b1c1eaddf36. Closing. -- Thanks, Maxim From unknown Sat Aug 16 15:57:00 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 24 Oct 2024 11:24:27 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator