dan <i@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at 71897) by debbugs.gnu.org; 2 Jul 2024 13:17:55 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 02 09:17:55 2024
Received: from localhost ([127.0.0.1]:36270 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sOdOM-0000Gg-EB
for submit <at> 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 <i@HIDDEN>) id 1sOdOJ-0000Fx-Cz
for 71897 <at> 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 <at> 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: <xms:-P2DZiFjWH9A8rjFq5MbaLrtgWlksu1XnovW4Ou6PmtuqZKkIiEiRA>
<xme:-P2DZjX3E-pUxYIv1kZcbX5DNfWtCBDiMycWIrOOWMH2va866t001oBcm20E86X1L
PGLHn4reKHj6EhYVQs>
X-ME-Received: <xmr:-P2DZsI31mzjZxBOcQqPrCdISqiXQxL4oZMG4t3mO66RpE1dRuSt62m9jbD9NYsfasp6I1FnGcr8zQ>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudehgdeitdcutefuodetggdotefrodftvf
curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
uegrihhlohhuthemuceftddtnecufghrlhcuvffnffculdduvddmnecujfgurhephffvuf
ffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhg
rghmvghsqeenucggtffrrghtthgvrhhnpeeikeeuvddtveelgeehudehleehteffhffhff
fhvdevgeevkeehhfffieeuieegieenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhk
ihhtfigrrhgvrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg
hilhhfrhhomhepihesuggrnhdrghgrmhgvsh
X-ME-Proxy: <xmx:-P2DZsF1CbVBCPF-7bAraRfe_oi5o5Vrp2jqBp-tZUdpenYqRBHpJQ>
<xmx:-f2DZoVNAr2WmPnBD-an4628T2dHuOLVZAsNPxZuS1idXv0bw8y90A>
<xmx:-f2DZvMbI9kxfAyP4IxFGpgdBqfo92aTGdADEujP7dls8ItvIliYXg>
<xmx:-f2DZv3JsO8D2EQ5njP2Pp-cQ-No1mmUKfk8vJPzyp13L9weC5qcww>
<xmx:-f2DZjcYlzXNEkyJ_RiFvh0ilMjWwoPw3tTqOxetSNoy-iUyqI60REBe>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
<71897 <at> debbugs.gnu.org>; Tue, 2 Jul 2024 09:17:43 -0400 (EDT)
From: dan <i@HIDDEN>
To: 71897 <at> 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@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <a7ddf7ed33ca8b5fedde35a4a44eec27f98caf02.1719926171.git.i@HIDDEN>
References: <a7ddf7ed33ca8b5fedde35a4a44eec27f98caf02.1719926171.git.i@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: dan <i@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
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 <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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><unpack-additional-sources>: Add
libprisma-for-telegram-desktop.
<patch-gir-ignore-paths>: New phase.
<use-system-xdg-desktop-portal>: 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 <nicholas@HIDDEN>
+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
++ "$<$<BOOL:${ignore_files}>:--ignore>"
+ "$<JOIN:${ignore_files},:>"
+ --output
+ ${gen_dst}
+
+From eed39522952c15f448c54290454806dd011c4996 Mon Sep 17 00:00:00 2001
+From: Nicholas Guriev <nicholas@HIDDEN>
+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 <git@HIDDEN>
+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.
+<https://github.com/microsoft/GSL/commit/e64c97fc2cfc11992098bb38eda932de275e3f4d>
+---
+ 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 <luhux76@HIDDEN>
;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico@HIDDEN>
;;; Copyright © 2024 Ricardo Wurmus <rekado@HIDDEN>
+;;; Copyright © 2024 dan <i@HIDDEN>
;;;
;;; 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
i@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#71897; Package guix-patches.
Full text available.
Received: (at 71897) by debbugs.gnu.org; 2 Jul 2024 13:17:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 02 09:17:52 2024
Received: from localhost ([127.0.0.1]:36268 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sOdOJ-0000GH-Hw
for submit <at> 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 <i@HIDDEN>) id 1sOdOG-0000Fu-FP
for 71897 <at> 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 <at> 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: <xms:9v2DZsl4_Ru3Vhe_k95i12rK9GgAIphcIwQQEmC_pQF-8zRgzdIZyw>
<xme:9v2DZr0fs5RFoxhswHQnf1DyO0hgwNAboOUu6idPHFu9OlpT8YFqpu7CiBWVnEX48
GTi2Z4WjR2GeBodtNQ>
X-ME-Received: <xmr:9v2DZqqpZF6C96Kfmv0J52lo5hn-iQhuYgtSIt4XOdmWNffso7HXXnv-axxOKKBFr1-jHzTaCUTb0w>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudehgdeitdcutefuodetggdotefrodftvf
curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesthekre
dtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrght
thgvrhhnpeehfeekffeiffekueehvdffjeeuvdejleektdeiueelhedtudegieefueeile
eggfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehi
segurghnrdhgrghmvghs
X-ME-Proxy: <xmx:9v2DZoll5roi2wWJpQaEtE2DfhXtd4FRfigJFDWWaERb8qz2TF2WQQ>
<xmx:9v2DZq0V4jcwLoq1OUT-dhYMl8dj8tx-EFdZwnXKeuZGHPBs49Mu1w>
<xmx:9v2DZvtEH22DUQJ3q6ZW6m71jWiP7_0bPe-wqaMZmCfQewhFtj7jRg>
<xmx:9v2DZmVyS0IYjeUO9DUWNja1RSPMrIyp7SGvfcYUgufPtqpVf_fmwQ>
<xmx:9v2DZv845w-KOlCaHPdY1EhJedMiZnD49MZM6jif5IhCwNj7BrIRG0XK>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
<71897 <at> debbugs.gnu.org>; Tue, 2 Jul 2024 09:17:41 -0400 (EDT)
From: dan <i@HIDDEN>
To: 71897 <at> 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: <eb1b362a20bfe2be4db5f17f1dd2d8f647578af5.1719926171.git.i@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <a7ddf7ed33ca8b5fedde35a4a44eec27f98caf02.1719926171.git.i@HIDDEN>
References: <a7ddf7ed33ca8b5fedde35a4a44eec27f98caf02.1719926171.git.i@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: dan <i@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
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 <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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 <sculpepper@HIDDEN>
;;; Copyright © 2024 aurtzy <aurtzy@HIDDEN>
;;; Copyright © 2024 Dariqq <dariqq@HIDDEN>
+;;; Copyright © 2024 dan <i@HIDDEN>
;;;
;;; 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 <i@HIDDEN>
+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
i@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#71897; Package guix-patches.
Full text available.
Received: (at 71897) by debbugs.gnu.org; 2 Jul 2024 13:17:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 02 09:17:51 2024
Received: from localhost ([127.0.0.1]:36264 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sOdOI-0000GE-Tw
for submit <at> 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 <i@HIDDEN>) id 1sOdOE-0000Fo-PF
for 71897 <at> 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 <at> 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: <xms:8_2DZjXZ9P1NGJedPTKl0yrqWxLrVmhgMFaiD7Zer7Tn-Nv5LIV7iA>
<xme:8_2DZrk1OJed_WLF06fLXuuM-jHs7wy4Pwl7sdSrmDt7k6g9jBtQu29pZxj1XEvGG
pA3iDO_DCtUcGM6yik>
X-ME-Received: <xmr:8_2DZvZtH89EoHJbNhr6zi3tFyBA9uTtUe4IItrB1bAp8rz_aWZBZ6Apinjm5GgxTcftzeRJhu-9lw>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudehgdeitdcutefuodetggdotefrodftvf
curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekredtre
dtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgv
rhhnpeelveelhfetheeuiedthfdvteelledvhffflefhkeffheekvdehffeigeektefgje
enucffohhmrghinhepghhithhlrggsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptden
ucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh
X-ME-Proxy: <xmx:8_2DZuVB2GQFXnBLqA0pHjnyDnUZiF26LfiDSvcWz32P_NRkEp9bug>
<xmx:8_2DZtmQp8zs9CxniiRxhy1zeEPags854UtgZzkOiod-_9fxWEsgkw>
<xmx:8_2DZrc-buazpPnxqEPG4avz2ZWGaBHoDpy2KNQ6gApo4-c7uf8z9A>
<xmx:8_2DZnGvmh5v_qb91ustLdshx6qVgydOXJPIIoT_OUsPv-osQYyAnw>
<xmx:8_2DZtvEPS3ZQVI1JE2nPLhPo23h4jjrjZdovqAuuCjp2wJO9LqfCC7K>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
<71897 <at> debbugs.gnu.org>; Tue, 2 Jul 2024 09:17:38 -0400 (EDT)
From: dan <i@HIDDEN>
To: 71897 <at> debbugs.gnu.org
Subject: [PATCH 1/3] gnu: Add cppgir.
Date: Tue, 2 Jul 2024 21:17:14 +0800
Message-ID: <a7ddf7ed33ca8b5fedde35a4a44eec27f98caf02.1719926171.git.i@HIDDEN>
X-Mailer: git-send-email 2.45.2
MIME-Version: 1.0
X-Debbugs-Cc: dan <i@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>,
Liliana Marie Prikler <liliana.prikler@HIDDEN>,
Vivien Kraus <vivien@HIDDEN>
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 <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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 <phodina@HIDDEN>
;;; Copyright © 2023 Saku Laesvuori <saku@HIDDEN>
;;; Copyright © 2024 Zheng Junjie <873216071@HIDDEN>
+;;; Copyright © 2024 dan <i@HIDDEN>
;;;
;;; 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
i@HIDDEN, maxim.cournoyer@HIDDEN, liliana.prikler@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN:bug#71897; Package guix-patches.
Full text available.
Received: (at 71897) by debbugs.gnu.org; 2 Jul 2024 11:10:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 02 07:10:30 2024
Received: from localhost ([127.0.0.1]:36087 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sObP3-0002aN-Qt
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1sObP0-0002a5-RI
for 71897 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: dan <i@HIDDEN>
Subject: Re: [bug#71897] [PATCH 1/2] gnu: Add cppgir.
In-Reply-To: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@HIDDEN>
(dan's message of "Tue, 2 Jul 2024 13:18:27 +0800")
References: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@HIDDEN>
Date: Tue, 02 Jul 2024 07:09:17 -0400
Message-ID: <87cynw59uq.fsf@HIDDEN>
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 <vivien@HIDDEN>,
Liliana Marie Prikler <liliana.prikler@HIDDEN>, 71897 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Dan,
dan <i@HIDDEN> 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 <phodina@HIDDEN>
> ;;; Copyright =C2=A9 2023 Saku Laesvuori <saku@HIDDEN>
> ;;; Copyright =C2=A9 2024 Zheng Junjie <873216071@HIDDEN>
> +;;; Copyright =C2=A9 2024 dan <i@HIDDEN>
> ;;;
> ;;; 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
guix-patches@HIDDEN:bug#71897; Package guix-patches.
Full text available.dan <i@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at 71897) by debbugs.gnu.org; 2 Jul 2024 05:27:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 02 01:27:16 2024
Received: from localhost ([127.0.0.1]:35549 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sOW2t-0004a8-Bb
for submit <at> 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 <i@HIDDEN>) id 1sOW2q-0004Zt-HE
for 71897 <at> 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 <at> 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: <xms:qo-DZiSJX1TXtpQIC6KMTwuIX8demrTvsQ5qQw9FaHRjtie6jsp0BA>
<xme:qo-DZnzYCa-1rq8s0ql5CBBs0V_3kKJYg6ZfdkAGcBD9sslE2DZMFg3huT3J-aJ4X
pSVrcBvzSpKPVHKH2E>
X-ME-Received: <xmr:qo-DZv3sYHG5mXiTZeEaZaAeJp6NeAl9G06uE7eAlqAAKkalSiE0D2o4UyNjrHKDsuK-_99Xn2u5CA>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeggdelvdcutefuodetggdotefrodftvf
curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
uegrihhlohhuthemuceftddtnecufghrlhcuvffnffculdduhedmnecujfgurhephffvuf
ffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgr
mhgvsheqnecuggftrfgrthhtvghrnhepgfejuedutdelffefkeekieettdelteegudfgtd
dtgedtgefhhfetteegtdejuefhnecuffhomhgrihhnpehgihhthhhusgdrtghomhdpkhhi
thifrghrvgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih
hlfhhrohhmpehisegurghnrdhgrghmvghs
X-ME-Proxy: <xmx:qo-DZuChT38IiDFK350Zz7Hoi1qDsGMJkWh39LEwNdi4PrDvKsqLrQ>
<xmx:qo-DZrjwGnc3fkfSHQ-PSQ7HnnuyyjiSCzPBBFjIT5OdHIyqzP1Vew>
<xmx:qo-DZqpqROU8ajATi_KeURwB4M2oChvGhJbBSF17vV0nN4ip9n203A>
<xmx:qo-DZui3S0l0oMa4bv6XW3TVY6Pau9epVp2LLs8TUwHZH-2oHBGtDA>
<xmx:qo-DZjYJhX9b8cCnqPaEOi_tT_hlgO3EGm7xD0SzIZDI6COwhONUa9Mh>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
<71897 <at> debbugs.gnu.org>; Tue, 2 Jul 2024 01:27:04 -0400 (EDT)
From: dan <i@HIDDEN>
To: 71897 <at> 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@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@HIDDEN>
References: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: dan <i@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 71897
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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]<unpack-additional-sources>: Add libprisma-for-telegram-desktop and
xdg-desktop-portal-for-telegram-desktop.
<patch-gir-ignore-paths>: 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 <nicholas@HIDDEN>
+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
++ "$<$<BOOL:${ignore_files}>:--ignore>"
+ "$<JOIN:${ignore_files},:>"
+ --output
+ ${gen_dst}
+
+From eed39522952c15f448c54290454806dd011c4996 Mon Sep 17 00:00:00 2001
+From: Nicholas Guriev <nicholas@HIDDEN>
+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 <git@HIDDEN>
+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.
+<https://github.com/microsoft/GSL/commit/e64c97fc2cfc11992098bb38eda932de275e3f4d>
+---
+ 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
i@HIDDEN, guix-patches@HIDDEN:bug#71897; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 2 Jul 2024 05:18:55 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 02 01:18:55 2024
Received: from localhost ([127.0.0.1]:35533 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sOVup-0004LV-75
for submit <at> 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 <i@HIDDEN>) id 1sOVum-0004LN-Ly
for submit <at> 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 <i@HIDDEN>) id 1sOVul-0007rQ-E0
for guix-patches@HIDDEN; 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 <i@HIDDEN>) id 1sOVuj-0003fG-Mt
for guix-patches@HIDDEN; 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 <guix-patches@HIDDEN>; 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: <xms:to2DZotKBvrevA5PrG7PhrjHrcuhKt56kf6W0wuJT9W9XD2FxLzSzw>
<xme:to2DZle7wKXdturY5MuwjhdRnk_ZInbQs7j2qkjPCkpj2zLo-VQ1uFQ9yDnzG_W7d
IZsKbnrEbPGBdRM2nU>
X-ME-Received: <xmr:to2DZjxG9NiOjF3SeWeyXVtarWZy89A0VBsVGqLMXQumlDc8-Lgjo_jaJMoCsd96KsqqpLVhTds9KA>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeggdeludcutefuodetggdotefrodftvf
curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekredtre
dtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgv
rhhnpeelveelhfetheeuiedthfdvteelledvhffflefhkeffheekvdehffeigeektefgje
enucffohhmrghinhepghhithhlrggsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptden
ucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh
X-ME-Proxy: <xmx:to2DZrM7T-MW2LqMhbk4ZOJJFfEsSV287DVyDI0LeY0tgtjOuY5pug>
<xmx:to2DZo8Bp3ciuC6eoXRJauzRcdo-Q-r1_87Y48AeZ0Rcwma26FexKg>
<xmx:to2DZjXAPPD0BDUzo5ywcBA1ppGsRLJ4x76C0AG32N-BdCfLNsqt_Q>
<xmx:to2DZhcGB3jV9s5PlRC92Cucj6kaZ4ayKbnOWqAjHau5HrlTshUW3g>
<xmx:t42DZmnqgGzhfSXW3ywMcyP9PClLFNWvFGiA8OO0mtyTlAsTiH3sYxvm>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
<guix-patches@HIDDEN>; Tue, 2 Jul 2024 01:18:45 -0400 (EDT)
From: dan <i@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH 1/2] gnu: Add cppgir.
Date: Tue, 2 Jul 2024 13:18:27 +0800
Message-ID: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@HIDDEN>
X-Mailer: git-send-email 2.45.2
MIME-Version: 1.0
X-Debbugs-Cc: Liliana Marie Prikler <liliana.prikler@HIDDEN>,
Maxim Cournoyer <maxim.cournoyer@HIDDEN>,
Vivien Kraus <vivien@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=103.168.172.147; envelope-from=i@HIDDEN;
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 <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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 <phodina@HIDDEN>
;;; Copyright © 2023 Saku Laesvuori <saku@HIDDEN>
;;; Copyright © 2024 Zheng Junjie <873216071@HIDDEN>
+;;; Copyright © 2024 dan <i@HIDDEN>
;;;
;;; 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
dan <i@HIDDEN>:liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN.
Full text available.liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN:bug#71897; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.