Received: (at 67493) by debbugs.gnu.org; 27 Nov 2023 19:27:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Nov 27 14:27:17 2023
Received: from localhost ([127.0.0.1]:44867 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r7hGG-0003vn-7e
for submit <at> debbugs.gnu.org; Mon, 27 Nov 2023 14:27:17 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:52356
helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <saku@HIDDEN>) id 1r7hGC-0003vc-Si
for 67493 <at> debbugs.gnu.org; Mon, 27 Nov 2023 14:27:14 -0500
Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127])
by mail.laesvuori.fi (Postfix) with ESMTPSA id 013F03400A9;
Mon, 27 Nov 2023 20:28:16 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
t=1701113297; bh=A2WHhOowzKhmkEfepmCTEYphTg0mpIuXVMtYQb3B7Vw=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=edPmMuIxVGrALP+Kjs72wj6Ty5lbjB0SlkqWkAskoHi30weFBRk7Uw1U5YHPYRCst
AtNG4aoER5FA/QDKnDzM/wc598cDsxwDaHObrBlot4SQr1Xq3dGggR7tRy79/Czv9h
qFEy0xl24NP2Wbw7zDBtp/Sqcg0OpCB3CV//swRI=
From: Saku Laesvuori <saku@HIDDEN>
To: 67493 <at> debbugs.gnu.org
Subject: [PATCH 6/6] gnu: Update telegram-desktop to 4.11.8
Date: Mon, 27 Nov 2023 21:26:10 +0200
Message-ID: <2736ef6da09a9e8e88f8643d2090cf294dab72a5.1701112690.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1701112690.git.saku@HIDDEN>
References: <cover.1701112690.git.saku@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67493
Cc: Saku Laesvuori <saku@HIDDEN>
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 (-)
* gnu/packages/telegram.scm: Import (gnu packages boost).
(libyuv-for-telegram-desktop, cmake-helpers-for-telegram-desktop,
codegen-for-telegram-desktop, lib-base-for-telegram-desktop,
lib-crl-for-telegram-desktop, lib-lottie-for-telegram-desktop,
lib-qr-for-telegram-desktop, lib-storage-for-telegram-desktop,
lib-tl-for-telegram-desktop, lib-webrtc-for-telegram-desktop,
tgcalls-for-telegram-desktop, webrtc-for-telegram-desktop): Bump to
submodule checkout.
(cmake-helpers-for-telegram-desktop)[patches]: Add patches to unbundle
gsl and cppgir.
(lib-base-for-telegram-desktop)[patches]: Add patch to fix build.
(libprisma-for-telegram-desktop, cppgir-for-telegram-desktop): New
variables.
(telegram-desktop): Update to 4.11.8.
[phases]<unpack-additional-sources>: Add libprisma-for-telegram-desktop.
<patch-gir-ignore-paths>: New phase.
[inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite and
gobject-introspection.
* gnu/local.mk (dist_patch_DATA): Add new patches.
* gnu/packages/patches/telegram-desktop-fix-lib-base-build.patch: New file.
* gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file.
* gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file.
Change-Id: I18bdd5a7e3f23464e01a05c5f7f8e595fbc15ebf
---
gnu/local.mk | 3 +
.../telegram-desktop-fix-lib-base-build.patch | 24 +++++
.../telegram-desktop-unbundle-cppgir.patch | 45 +++++++++
.../telegram-desktop-unbundle-gsl.patch | 33 +++++++
gnu/packages/telegram.scm | 99 +++++++++++++------
5 files changed, 176 insertions(+), 28 deletions(-)
create mode 100644 gnu/packages/patches/telegram-desktop-fix-lib-base-build.patch
create mode 100644 gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch
create mode 100644 gnu/packages/patches/telegram-desktop-unbundle-gsl.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index ae332c6390..ec40871370 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2035,6 +2035,9 @@ dist_patch_DATA = \
%D%/packages/patches/texinfo-headings-single.patch \
%D%/packages/patches/texinfo-5-perl-compat.patch \
%D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \
+ %D%/packages/patches/telegram-desktop-fix-lib-base-build.patch \
+ %D%/packages/patches/telegram-desktop-unbundle-cppgir.patch \
+ %D%/packages/patches/telegram-desktop-unbundle-gsl.patch \
%D%/packages/patches/telegram-purple-adjust-test.patch \
%D%/packages/patches/teuchos-remove-duplicate-using.patch \
%D%/packages/patches/texi2html-document-encoding.patch \
diff --git a/gnu/packages/patches/telegram-desktop-fix-lib-base-build.patch b/gnu/packages/patches/telegram-desktop-fix-lib-base-build.patch
new file mode 100644
index 0000000000..6cc84d40f5
--- /dev/null
+++ b/gnu/packages/patches/telegram-desktop-fix-lib-base-build.patch
@@ -0,0 +1,24 @@
+From 8d1273f89b8d0241c86c56792fc0811b0d9d746f Mon Sep 17 00:00:00 2001
+From: Saku Laesvuori <saku@HIDDEN>
+Date: Sun, 26 Nov 2023 23:13:38 +0200
+Subject: [PATCH] Fix build
+
+---
+ base/qt/qt_compare.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/base/qt/qt_compare.h b/base/qt/qt_compare.h
+index ca03fa2..948e5e9 100644
+--- a/base/qt/qt_compare.h
++++ b/base/qt/qt_compare.h
+@@ -8,6 +8,7 @@
+
+ #include <compare>
+ #include <gsl/pointers>
++#include <variant>
+
+ #include <QString>
+
+--
+2.41.0
+
diff --git a/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch
new file mode 100644
index 0000000000..70c96b320c
--- /dev/null
+++ b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch
@@ -0,0 +1,45 @@
+From a3c3c1ae0ec15f3ca5ea7696d92958ecf68688a7 Mon Sep 17 00:00:00 2001
+From: Saku Laesvuori <saku@HIDDEN>
+Date: Sun, 26 Nov 2023 12:22:27 +0200
+Subject: [PATCH] Unbundle cppgir
+
+---
+ external/glib/CMakeLists.txt | 8 --------
+ external/glib/generate_cppgir.cmake | 2 ++
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt
+index 3c6fe4b..ee057a4 100644
+--- a/external/glib/CMakeLists.txt
++++ b/external/glib/CMakeLists.txt
+@@ -7,14 +7,6 @@
+ add_library(external_glib INTERFACE IMPORTED GLOBAL)
+ add_library(desktop-app::external_glib ALIAS external_glib)
+
+-function(add_cppgir) # isolate scope
+- set(BUILD_TESTING OFF)
+- set(BUILD_DOC OFF)
+- set(BUILD_EXAMPLES OFF)
+- add_subdirectory(cppgir EXCLUDE_FROM_ALL)
+-endfunction()
+-add_cppgir()
+-
+ include(generate_cppgir.cmake)
+ generate_cppgir(external_glib Gio-2.0)
+
+diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake
+index c9872a6..7925cf4 100644
+--- a/external/glib/generate_cppgir.cmake
++++ b/external/glib/generate_cppgir.cmake
+@@ -4,6 +4,8 @@
+ # For license and copyright information please follow this link:
+ # https://github.com/desktop-app/legal/blob/master/LEGAL
+
++find_package(CppGir REQUIRED gi)
++
+ function(generate_cppgir target_name gir)
+ # cppgir generates all the dependent headers everytime, better to have a global folder
+ set(gen_dst ${CMAKE_BINARY_DIR}/gen)
+--
+2.41.0
+
diff --git a/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch
new file mode 100644
index 0000000000..56338640f9
--- /dev/null
+++ b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch
@@ -0,0 +1,33 @@
+From 9271e1db51f3409d7ecc2afcb130fce5ca15fcbc Mon Sep 17 00:00:00 2001
+From: Saku Laesvuori <saku@HIDDEN>
+Date: Sun, 26 Nov 2023 11:09:46 +0200
+Subject: [PATCH] Revert "Force usage of GSL fork because of a libstdc++ bug."
+
+This reverts commit 982546b169df3d479e6511425870327559b38a89.
+---
+ external/gsl/CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/external/gsl/CMakeLists.txt b/external/gsl/CMakeLists.txt
+index 8eaf19c..344f948 100644
+--- a/external/gsl/CMakeLists.txt
++++ b/external/gsl/CMakeLists.txt
+@@ -7,7 +7,6 @@
+ add_library(external_gsl INTERFACE IMPORTED GLOBAL)
+ add_library(desktop-app::external_gsl ALIAS external_gsl)
+
+-#[[
+ if (DESKTOP_APP_USE_PACKAGED)
+ if (DESKTOP_APP_USE_PACKAGED_LAZY)
+ find_package(Microsoft.GSL 4.0.0 QUIET)
+@@ -20,7 +19,6 @@ if (DESKTOP_APP_USE_PACKAGED)
+ return()
+ endif()
+ endif()
+-]]
+
+ # https://gitlab.kitware.com/cmake/cmake/-/issues/25222
+ if (NOT EXISTS ${third_party_loc}/GSL/include)
+--
+2.41.0
+
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 4814c22b6c..3208990c63 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -27,6 +27,7 @@ (define-module (gnu packages telegram)
#:use-module (gnu packages assembly)
#:use-module (gnu packages audio)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
@@ -81,11 +82,11 @@ (define-module (gnu packages telegram)
#:use-module (guix build-system python)
#:use-module (guix build-system qt))
-(define %telegram-version "4.8.1")
+(define %telegram-version "4.11.8")
(define libyuv-for-telegram-desktop
- (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da")
- (revision "2439"))
+ (let ((commit "04821d1e7d60845525e8db55c7bcd41ef5be9406")
+ (revision "2440"))
(origin
(method git-fetch)
(uri (git-reference
@@ -96,67 +97,72 @@ (define libyuv-for-telegram-desktop
(git-version "0" revision commit)))
(sha256
(base32
- "1b4k8yskr9ffl5k8s9i0af1gn1pavsfixla26vh8bij69rdr7f9c")))))
+ "1fsvc0f8mckrdzys8lnlnbw6676mjamm6p3ghr2h9liqfa83s6wg")))))
(define cmake-helpers-for-telegram-desktop
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/desktop-app/cmake_helpers.git")
- (commit "6ab5543b3dd1e40979d258e46d03376931b6c37b")))
+ (commit "c373a0a0141bbe146a9507f02b8515183748eb51")))
(file-name
(git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version))
+ (patches
+ (search-patches "telegram-desktop-unbundle-gsl.patch"
+ "telegram-desktop-unbundle-cppgir.patch"))
(sha256
(base32
- "0y96mvzs113zh8bdw1h3i6l0pgwg93rigrday8kfdg4magz686k6"))))
+ "1wr624iqffgl48d8rnkb3ys16lyrc1gi9gh8wbwnskfidhf1av7a"))))
(define codegen-for-telegram-desktop
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/desktop-app/codegen.git")
- (commit "1a969faa0afb29d53af03e530775eccdfb8433f1")))
+ (commit "805b851d69444ab3659b619566d186d0be83dcd9")))
(file-name
(git-file-name "codegen-for-telegram-desktop" %telegram-version))
(sha256
(base32
- "1xmw8dfm51p5g20rlmzqnr72a14ngyxwq09an8clf1v5s6mmwvak"))))
+ "030i0pnzlbnyvizmjzzj75ipaj2z6sgkzgv1w0n6k4x5f7jgx9hd"))))
(define lib-base-for-telegram-desktop
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/desktop-app/lib_base.git")
- (commit "fd9adb30ee906ea02c125eaa58fcfae773fdc677")))
+ (commit "5432626ef2af59f55110c3bf17556d16c48a4ac3")))
(file-name
(git-file-name "lib-base-for-telegram-desktop" %telegram-version))
+ (patches
+ (search-patches "telegram-desktop-fix-lib-base-build.patch"))
(sha256
(base32
- "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83"))))
+ "1h59jhl3zks502m0h0lg7wfk70yzjsr688g3pm097khd3n1ni2lk"))))
(define lib-crl-for-telegram-desktop
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/desktop-app/lib_crl.git")
- (commit "3d7e1e1f1321c3defd21c01882d674e485ecd8df")))
+ (commit "078006d29af0002e6cd8c61a405cdeaf65b37142")))
(file-name
(git-file-name "lib-crl-for-telegram-desktop" %telegram-version))
(sha256
(base32
- "06mzafnjpfr5ih297dh7bxm6bgpg0wy0gv2r2732n5szyrg9sdl6"))))
+ "18n88ghj3akpkxvllrh1rs19vd0d3xw87hd67qphr30b6ggqs9fd"))))
(define lib-lottie-for-telegram-desktop
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/desktop-app/lib_lottie.git")
- (commit "3e9c2f1026e4b5aa3202fca4cc67ece36c7cebb2")))
+ (commit "1a700e5a0d7c3e2f617530354ff2a47c5c72bb4a")))
(file-name
(git-file-name "lib-lottie-for-telegram-desktop" %telegram-version))
(sha256
(base32
- "0l57ibfij9xm4ww4s9cc63q1x8xzpc6ablwaji1krrn3xxksqdd4"))))
+ "18w35sz6k3wcv07v0szx3avpfdl0rjby6yqm1fzmx7fqw2jn6wpl"))))
(define lib-qr-for-telegram-desktop
(origin
@@ -187,24 +193,24 @@ (define lib-spellcheck-for-telegram-desktop
(method git-fetch)
(uri (git-reference
(url "https://github.com/desktop-app/lib_spellcheck.git")
- (commit "ae89fefd239ecc47d4dab7ba29f9e230376a57d3")))
+ (commit "c97b3fe73ddfbc80c9ecacfbf2cda824e5b05ff5")))
(file-name
(git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version))
(sha256
(base32
- "147xbbcza5q4wcdipk5jplajzkc48971kg2s7qv5jlz33sxkw1lq"))))
+ "0ir8waxz5l099s1qfjmp7vzlma1xl27fhanmyzfxxz4rik4b9biq"))))
(define lib-storage-for-telegram-desktop
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/desktop-app/lib_storage.git")
- (commit "839609369d04615475cb1518636de3619106a917")))
+ (commit "de731885163bc1b3fe3095413453777ee89a8561")))
(file-name
(git-file-name "lib-storage-for-telegram-desktop" %telegram-version))
(sha256
(base32
- "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm"))))
+ "1crnh8awh6axydranlbbxphvphghqqbp8sgcg9gr2gsw22zm12pw"))))
(define lib-tl-for-telegram-desktop
(origin
@@ -223,12 +229,12 @@ (define lib-ui-for-telegram-desktop
(method git-fetch)
(uri (git-reference
(url "https://github.com/desktop-app/lib_ui.git")
- (commit "37531086ec21a8569deddedb11b402f8a3157b90")))
+ (commit "fee301f94197d3351f2f20671c329b81540e63e2")))
(file-name
(git-file-name "lib-ui-for-telegram-desktop" %telegram-version))
(sha256
(base32
- "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0"))))
+ "0db09qpw1kd3kpa6jj9jmsdq2r92gw5q2slxw5r9z6xm4w40q4vx"))))
(define lib-webrtc-for-telegram-desktop
(origin
@@ -247,28 +253,28 @@ (define lib-webview-for-telegram-desktop
(method git-fetch)
(uri (git-reference
(url "https://github.com/desktop-app/lib_webview.git")
- (commit "f632fc84cbc62ae8abbbd05f81d472757a337c11")))
+ (commit "3495eb8dd8f4e2dab9493b4a698e5006fadbca47")))
(file-name
(git-file-name "lib-webview-for-telegram-desktop" %telegram-version))
(sha256
(base32
- "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i"))))
+ "0nj72zng77xbizxwmhasdbnvr04z0hjjrw8pg4nyxjkm2027nfvq"))))
(define tgcalls-for-telegram-desktop
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/TelegramMessenger/tgcalls.git")
- (commit "2e2797648aac2588e7fe479c2e8b4455ec65c5e6")))
+ (commit "eb120ec4d347dd8ba561d8bbbf0858f20baae4ba")))
(file-name
(git-file-name "tgcalls-for-telegram-desktop" %telegram-version))
(sha256
(base32
- "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z"))))
+ "1g0ix1abjmgfg7ymg0w0vdl57az2vdn6q5zfjkcisvi7sab7rfrl"))))
(define-public webrtc-for-telegram-desktop
- (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b")
- (revision "389"))
+ (let ((commit "be153adaa363b2b13242466ad5b7b87f61301639")
+ (revision "390"))
(hidden-package
(package
(name "webrtc-for-telegram-desktop")
@@ -284,7 +290,7 @@ (define-public webrtc-for-telegram-desktop
(file-name
(git-file-name name version))
(sha256
- (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k"))
+ (base32 "0q8n1px35srxmymwvqkk41b8vdmspwkp35v5i1dn2ijiyjkwa0ba"))
(patches
(search-patches
;; https://github.com/desktop-app/tg_owt/pull/123
@@ -399,6 +405,33 @@ (define cld3-for-telegram-desktop
(base32
"0ayrrhfdwrf4260h9fsirkhhfrcvc3qqnh6h9wj3ixij2lq0wwqb"))))
+(define libprisma-for-telegram-desktop
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/libprisma")
+ (commit "629dc69fbffa5d63954c8e8909a26efdd98573b0")))
+ (file-name
+ (git-file-name "libprisma-for-telegram-desktop" %telegram-version))
+ (sha256
+ (base32
+ "1r952f6kgzknkffvyy5cnz97qh799x21m7mclwqycjp3gcf3csja"))))
+
+(define cppgir-for-telegram-desktop
+ (package
+ (inherit cppgir)
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/mnauw/cppgir.git")
+ (commit "69ef481cba38e848554cc5403b8d4141d3c51335")))
+ (file-name
+ (git-file-name "cppgir-for-telegram-desktop" %telegram-version))
+ (sha256
+ (base32
+ "0l87h8mx0ri60493i19k0kh44ccy8k7zgb1m74sd001x4ilygv0v"))))))
+
(define-public telegram-desktop
(package
(name "telegram-desktop")
@@ -414,7 +447,7 @@ (define-public telegram-desktop
(file-name
(git-file-name name version))
(sha256
- (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0"))
+ (base32 "00958hwmbmzlq6110bm5mnvxvdk1z03hc1d90iaasinhr32jjrp4"))
(patches
(search-patches
;; https://github.com/telegramdesktop/tdesktop/pull/24126
@@ -480,7 +513,13 @@ (define-public telegram-desktop
("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop)
("Telegram/lib_webview" #$lib-webview-for-telegram-desktop)
("Telegram/ThirdParty/cld3" #$cld3-for-telegram-desktop)
+ ("Telegram/ThirdParty/libprisma" #$libprisma-for-telegram-desktop)
("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop)))))
+ (add-after 'unpack-additional-sources 'patch-gir-ignore-paths
+ (lambda _
+ (substitute* "cmake/external/glib/generate_cppgir.cmake"
+ (("\\$\\{cmake_helpers_loc\\}/external/glib/cppgir/data")
+ (string-append #$(this-package-input "cppgir") "/share/cppgir")))))
(add-after 'install 'glib-or-gtk-compile-schemas
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
(add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
@@ -493,13 +532,17 @@ (define-public telegram-desktop
(inputs
(list abseil-cpp-cxxstd17
alsa-lib
+ boost
c++-gsl
crc32c
+ cppgir-for-telegram-desktop
+ expected-lite
fcitx-qt5
fcitx5-qt
ffmpeg
glib-next
glibmm-next
+ gobject-introspection
gtk+
hime
hunspell
--
2.41.0
guix-patches@HIDDEN:bug#67493; Package guix-patches.
Full text available.
Received: (at 67493) by debbugs.gnu.org; 27 Nov 2023 19:27:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Nov 27 14:27:11 2023
Received: from localhost ([127.0.0.1]:44864 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r7hGA-0003vS-JD
for submit <at> debbugs.gnu.org; Mon, 27 Nov 2023 14:27:11 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:41538
helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <saku@HIDDEN>) id 1r7hG7-0003vI-SH
for 67493 <at> debbugs.gnu.org; Mon, 27 Nov 2023 14:27:08 -0500
Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127])
by mail.laesvuori.fi (Postfix) with ESMTPSA id D882B3400A9;
Mon, 27 Nov 2023 20:28:11 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
t=1701113292; bh=70pdBDF63dsehhOoV4qFYOzFLPqZVsPVTGYBgSrcrWw=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=sYvk9HjyiDSGoWXR71lUlk4tvWyzNGi/4ZeBBrjQH1Ldh3gjRrbq51cXqsLz75pN4
tB6jVfQudqRqDRDQexJO7BzSC5kBfmilzAboK7Zz1dMix/e8KHc65s8z+yieT292KX
1zEySCZ9C//3xevDEQmlLBd77BJu+a8r4GuNr8Ms=
From: Saku Laesvuori <saku@HIDDEN>
To: 67493 <at> debbugs.gnu.org
Subject: [PATCH 5/6] gnu: Update range-v3 to 0.12.0
Date: Mon, 27 Nov 2023 21:26:09 +0200
Message-ID: <51c27363d64b1c7498adffb451ca27cd25230fa2.1701112690.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1701112690.git.saku@HIDDEN>
References: <cover.1701112690.git.saku@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67493
Cc: Saku Laesvuori <saku@HIDDEN>
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 (-)
* gnu/packages/cpp.scm (range-v3): Update to 0.12.0
[patches]: Remove upstreamed patch.
* gnu/packages/patches/range-v3-build-with-gcc10.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove deleted patch.
Change-Id: I426caeef6c058b2015f564ed1485b7e107e061cc
---
gnu/local.mk | 1 -
gnu/packages/cpp.scm | 5 +-
.../patches/range-v3-build-with-gcc10.patch | 122 ------------------
3 files changed, 2 insertions(+), 126 deletions(-)
delete mode 100644 gnu/packages/patches/range-v3-build-with-gcc10.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 023cd4b17f..ae332c6390 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1921,7 +1921,6 @@ dist_patch_DATA = \
%D%/packages/patches/qtwayland-cleanup-callbacks.patch \
%D%/packages/patches/ragel-char-signedness.patch \
%D%/packages/patches/randomjungle-disable-static-build.patch \
- %D%/packages/patches/range-v3-build-with-gcc10.patch \
%D%/packages/patches/raptor2-heap-overflow.patch \
%D%/packages/patches/ratpoints-sturm_and_rp_private.patch \
%D%/packages/patches/ratpoison-shell.patch \
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index e35a17811e..0e4aa202e9 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -187,7 +187,7 @@ (define-public asmjit
(define-public range-v3
(package
(name "range-v3")
- (version "0.11.0")
+ (version "0.12.0")
(source
(origin
(method git-fetch)
@@ -197,9 +197,8 @@ (define-public range-v3
(commit version)))
(file-name
(git-file-name name version))
- (patches (search-patches "range-v3-build-with-gcc10.patch"))
(sha256
- (base32 "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh"))))
+ (base32 "0r85s5rmp5ixmik2y5y4w760pa38j1sg9hbr1fss2flibzvrf53d"))))
(build-system cmake-build-system)
(arguments
(list
diff --git a/gnu/packages/patches/range-v3-build-with-gcc10.patch b/gnu/packages/patches/range-v3-build-with-gcc10.patch
deleted file mode 100644
index a5d5b33523..0000000000
--- a/gnu/packages/patches/range-v3-build-with-gcc10.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 0487cca29e352e8f16bbd91fda38e76e39a0ed28 Mon Sep 17 00:00:00 2001
-From: Louis Dionne <ldionne.2@HIDDEN>
-Date: Tue, 15 Jun 2021 14:40:01 -0400
-Subject: [PATCH] Work around broken integration with latest libc++. (#1635)
-
-* Work around broken integration with latest libc++.
-
-In newer versions of libc++, the base template of std::iterator_traits
-provides a member typedef called __primary_template which is an alias
-to the std::iterator_traits specialization itself. This fix works with
-both the old version of libc++ and the new one.
-
-Fixes issue #1633.
-
-* Fix is_std_iterator_traits_specialized_v on MSVC
-
-It used to pretend that std::iterator_traits<T*> is a user-defined
-specialization, which isn't the case. This is due to MSVC's
-iterator_traits<T*> specialization not posing as the base template.
----
- include/std/detail/associated_types.hpp | 22 +++++++++++-----
- test/CMakeLists.txt | 1 +
- test/bug1633.cpp | 34 +++++++++++++++++++++++++
- 3 files changed, 51 insertions(+), 6 deletions(-)
- create mode 100644 test/bug1633.cpp
-
-diff --git a/include/std/detail/associated_types.hpp b/include/std/detail/associated_types.hpp
-index b642166d4..449a3f91c 100644
---- a/include/std/detail/associated_types.hpp
-+++ b/include/std/detail/associated_types.hpp
-@@ -265,11 +265,22 @@ namespace ranges
- template<typename I>
- char is_std_iterator_traits_specialized_impl_(void *);
- #elif defined(_LIBCPP_VERSION)
-- template<typename I, bool B>
-- char (
-- &is_std_iterator_traits_specialized_impl_(std::__iterator_traits<I, B> *))[2];
-+ // In older versions of libc++, the base template inherits from std::__iterator_traits<typename, bool>.
-+ template<template<typename, bool> class IteratorTraitsBase, typename I, bool B>
-+ char (&libcpp_iterator_traits_base_impl(IteratorTraitsBase<I, B> *))[2];
-+ template<template<typename, bool> class IteratorTraitsBase, typename I>
-+ char libcpp_iterator_traits_base_impl(void *);
-+
-+ // In newer versions, the base template has only one template parameter and provides the
-+ // __primary_template typedef which aliases the iterator_traits specialization.
-+ template<template<typename> class, typename I>
-+ char (&libcpp_iterator_traits_base_impl(typename std::iterator_traits<I>::__primary_template *))[2];
-+ template<template<typename> class, typename I>
-+ char libcpp_iterator_traits_base_impl(void *);
-+
- template<typename I>
-- char is_std_iterator_traits_specialized_impl_(void *);
-+ auto is_std_iterator_traits_specialized_impl_(std::iterator_traits<I>* traits)
-+ -> decltype(libcpp_iterator_traits_base_impl<std::__iterator_traits, I>(traits));
- #elif defined(_MSVC_STL_VERSION)
- template<typename I>
- char (&is_std_iterator_traits_specialized_impl_(
-@@ -287,14 +298,13 @@ namespace ranges
- RANGES_INLINE_VAR constexpr bool is_std_iterator_traits_specialized_v =
- 1 == sizeof(is_std_iterator_traits_specialized_impl_<I>(
- static_cast<std::iterator_traits<I> *>(nullptr)));
--
-+#endif
- // The standard iterator_traits<T *> specialization(s) do not count
- // as user-specialized. This will no longer be necessary in C++20.
- // This helps with `T volatile*` and `void *`.
- template<typename T>
- RANGES_INLINE_VAR constexpr bool is_std_iterator_traits_specialized_v<T *> =
- false;
--#endif
- } // namespace detail
- /// \endcond
- } // namespace ranges
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 889f314af..2c2b7c09c 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -19,3 +19,4 @@ rv3_add_test(test.bug474 bug474 bug474.cpp)
- rv3_add_test(test.bug566 bug566 bug566.cpp)
- rv3_add_test(test.bug1322 bug1322 bug1322.cpp)
- rv3_add_test(test.bug1335 bug1335 bug1335.cpp)
-+rv3_add_test(test.bug1633 bug1633 bug1633.cpp)
-diff --git a/test/bug1633.cpp b/test/bug1633.cpp
-new file mode 100644
-index 000000000..be52420ad
---- /dev/null
-+++ b/test/bug1633.cpp
-@@ -0,0 +1,34 @@
-+// Range v3 library
-+//
-+// Use, modification and distribution is subject to the
-+// Boost Software License, Version 1.0. (See accompanying
-+// file LICENSE_1_0.txt or copy at
-+// http://www.boost.org/LICENSE_1_0.txt)
-+//
-+// Project home: https://github.com/ericniebler/range-v3
-+
-+#include <cstddef>
-+#include <iterator>
-+#include <range/v3/iterator.hpp>
-+
-+struct X { };
-+
-+namespace std {
-+ template<> struct iterator_traits<X> { };
-+}
-+
-+struct Y {
-+ using difference_type = std::ptrdiff_t;
-+ using value_type = int;
-+ using pointer = int*;
-+ using reference = int&;
-+ using iterator_category = std::forward_iterator_tag;
-+};
-+
-+static_assert(ranges::detail::is_std_iterator_traits_specialized_v<X>, "");
-+static_assert(!ranges::detail::is_std_iterator_traits_specialized_v<Y>, "");
-+static_assert(!ranges::detail::is_std_iterator_traits_specialized_v<int*>, "");
-+
-+int main()
-+{
-+}
--
2.41.0
guix-patches@HIDDEN:bug#67493; Package guix-patches.
Full text available.
Received: (at 67493) by debbugs.gnu.org; 27 Nov 2023 19:27:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Nov 27 14:27:05 2023
Received: from localhost ([127.0.0.1]:44861 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r7hG5-0003v6-5B
for submit <at> debbugs.gnu.org; Mon, 27 Nov 2023 14:27:05 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:41530
helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <saku@HIDDEN>) id 1r7hG3-0003uy-V8
for 67493 <at> debbugs.gnu.org; Mon, 27 Nov 2023 14:27:04 -0500
Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127])
by mail.laesvuori.fi (Postfix) with ESMTPSA id 12A823400A9;
Mon, 27 Nov 2023 20:28:07 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
t=1701113288; bh=/kI7FFlwq1Gjgh6ImImOJJt0J5mznQ4l5xntBEyfWak=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=Ut27Ug5AxTA3mPxMvkz4X8WwkjGRClJTlMlJIo9Z7zOzC+LDool/2K/ayZRVrp5+T
srwUa3o38uhz79JttKoagEPlhnDawquDA7zYMNeIgHypAkhYuW5OUXMpub3ZXfHWWe
zxmR7TMx+gBIBL7644OSQDg0YwcSXWQJxo5yDz3E=
From: Saku Laesvuori <saku@HIDDEN>
To: 67493 <at> debbugs.gnu.org
Subject: [PATCH 4/6] gnu: Add cppgir
Date: Mon, 27 Nov 2023 21:26:08 +0200
Message-ID: <ed58d86979aa98510c773a03c399a401460d56e9.1701112690.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1701112690.git.saku@HIDDEN>
References: <cover.1701112690.git.saku@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Liliana Marie Prikler <liliana.prikler@HIDDEN>,
Maxim Cournoyer <maxim.cournoyer@HIDDEN>,
Raghav Gururajan <rg@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67493
Cc: Saku Laesvuori <saku@HIDDEN>
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 (-)
* gnu/packages/glib.scm: Import (gnu packages pretty-print).
(cppgir): New variable.
Change-Id: I7e2cdf2d77382bfe876173901127d358b64c0dfe
---
gnu/packages/glib.scm | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index a9fee74daf..53c08935c5 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -68,6 +68,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)
@@ -1578,3 +1579,28 @@ (define-public dbus-test-runner
(description "A small little utility to run a couple of executables under a
new DBus session for testing.")
(license license:gpl3)))
+
+(define-public cppgir
+ (package
+ (name "cppgir")
+ (version "0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://gitlab.com/mnauw/cppgir/-/archive/v" version
+ "/cppgir-v" version ".tar.gz"))
+ (sha256
+ (base32 "13plz1xn25lyhfxwyhmlzjn8jliakvqa06a28g5czlav1zg1565g"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list "-DINTERNAL_EXPECTED=OFF")))
+ (inputs (list boost fmt expected-lite))
+ (home-page "https://gitlab.com/mnauw/cppgir")
+ (synopsis "A GObject-Introspection C++ binding wrapper generator")
+ (description "it processes .gir files derived from GObject-Introspection
+annotations into a set of C++ files defining suitable namespaces, classes and
+other types that together from a C++ binding. In this way, the plain C
+libraries and objects become available as native objects along with (RAII)
+managed resource handling.")
+ (license license:expat)))
--
2.41.0
liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, rg@HIDDEN, guix-patches@HIDDEN:bug#67493; Package guix-patches.
Full text available.
Received: (at 67493) by debbugs.gnu.org; 27 Nov 2023 19:27:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Nov 27 14:27:02 2023
Received: from localhost ([127.0.0.1]:44850 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r7hG1-0003uF-M2
for submit <at> debbugs.gnu.org; Mon, 27 Nov 2023 14:27:02 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:40148
helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <saku@HIDDEN>) id 1r7hFz-0003u0-BH
for 67493 <at> debbugs.gnu.org; Mon, 27 Nov 2023 14:26:59 -0500
Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127])
by mail.laesvuori.fi (Postfix) with ESMTPSA id 71B843400A9;
Mon, 27 Nov 2023 20:28:03 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
t=1701113283; bh=q9cDe3sMGlKzqCPdKaQ1ISJsSX8OYFFPbUwKIzVGzLc=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=BZh1obCbloObfOlv68nTUifC++CO8pGJd1VdmShUWMR4r68AZ+LoZx0VY6wZagXgk
ZZxhF/4NTp+7XwAJk3+SW+/3T7ZR7pwxo4IpN6AW8iHULnm9EEKeCrHPudSrBrZoPW
CTpNQEP9sY0nig0kmBl6vIvabPK9jPg/TnNSxjds=
From: Saku Laesvuori <saku@HIDDEN>
To: 67493 <at> debbugs.gnu.org
Subject: [PATCH 3/6] gnu: Add expected-lite
Date: Mon, 27 Nov 2023 21:26:07 +0200
Message-ID: <c633a12ed25c7bd7bb4a0950223dfac906a94547.1701112690.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1701112690.git.saku@HIDDEN>
References: <cover.1701112690.git.saku@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67493
Cc: Saku Laesvuori <saku@HIDDEN>
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 (-)
* gnu/packages/cpp.scm (expected-lite): New variable.
Change-Id: I627bc4a811107b1c4fb9ed8f3e2a5b23043eb97c
---
gnu/packages/cpp.scm | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 5e35a03254..e35a17811e 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -2977,3 +2977,24 @@ (define-public tl-optional
the std::optional for C++11/14/17, with support for monadic operations added in
C++23.")
(license license:cc0)))
+
+(define-public expected-lite
+ (package
+ (name "expected-lite")
+ (version "0.6.3")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/martinmoene/expected-lite")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0d58nqh2fwdzdpln2wlnf898wyfxdnskq6ff33azbg92d5ibzys2"))))
+ (build-system cmake-build-system)
+ (home-page "https://github.com/martinmoene/expected-lite")
+ (synopsis "Expected objects for C++11 and later")
+ (description "Expected lite is a single-file header-only library for
+objects that either represent a valid value or an error that you can pass
+by value. It is intended for use with C++11 and later")
+ (license license:boost1.0)))
--
2.41.0
guix-patches@HIDDEN:bug#67493; Package guix-patches.
Full text available.
Received: (at 67493) by debbugs.gnu.org; 27 Nov 2023 19:26:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Nov 27 14:26:56 2023
Received: from localhost ([127.0.0.1]:44846 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r7hFw-0003tp-Be
for submit <at> debbugs.gnu.org; Mon, 27 Nov 2023 14:26:56 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:40140
helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <saku@HIDDEN>) id 1r7hFt-0003tg-U4
for 67493 <at> debbugs.gnu.org; Mon, 27 Nov 2023 14:26:54 -0500
Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127])
by mail.laesvuori.fi (Postfix) with ESMTPSA id 9EEFE3400A9;
Mon, 27 Nov 2023 20:27:57 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
t=1701113278; bh=ZPEIFVsoNdzVjKYqcYaSNWXK8PwKE8JlbiUECvry55o=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=A+iZq2RVURKfA4fJcpfaj+E7Hh6evllJUZlMaizw8+INKeokuV+WfG5I1d5frzy9C
aFL8CGp0EdzMtNx0RAM4WxJxgXT8jO039WBYaUgww6Po45/hdFp00vKZU2ADaLUKBX
+9M9fYWQEGmvTf/FCKBky7yj895EGP7jeWmIEmms=
From: Saku Laesvuori <saku@HIDDEN>
To: 67493 <at> debbugs.gnu.org
Subject: [PATCH 2/6] gnu: Update glibmm-next to 2.77.0
Date: Mon, 27 Nov 2023 21:26:06 +0200
Message-ID: <34d5afe5af44fb813c3975ee9064a9366e5b7b0f.1701112690.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1701112690.git.saku@HIDDEN>
References: <cover.1701112690.git.saku@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Liliana Marie Prikler <liliana.prikler@HIDDEN>,
Maxim Cournoyer <maxim.cournoyer@HIDDEN>,
Raghav Gururajan <rg@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67493
Cc: Saku Laesvuori <saku@HIDDEN>
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 (-)
* gnu/packages/glib.scm (glibmm-next): Update to 2.77.0
Change-Id: I0831f9dc91f460f8d86ff8908846db6e332c9c00
---
gnu/packages/glib.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 353cb95aaf..a9fee74daf 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -1042,7 +1042,7 @@ (define glibmm
(define-public glibmm-next
(package
(inherit glibmm)
- (version "2.76.0")
+ (version "2.77.0")
(name "glibmm")
(source (origin
(method url-fetch)
@@ -1051,7 +1051,7 @@ (define-public glibmm-next
"/glibmm-" version ".tar.xz"))
(sha256
(base32
- "1cia8vrpwzn8zwalws42mga5hi965840m5s8dvfzv55xx86dhdw6"))))
+ "03j5smrb47pp7dhi0y7bcgzjz7li7zzjv9cj6kwgnvdcwy24dcvw"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs glibmm)
(replace "glib" glib-next)))))
--
2.41.0
liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, rg@HIDDEN, guix-patches@HIDDEN:bug#67493; Package guix-patches.
Full text available.
Received: (at 67493) by debbugs.gnu.org; 27 Nov 2023 19:26:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Nov 27 14:26:50 2023
Received: from localhost ([127.0.0.1]:44843 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r7hFp-0003tT-Ug
for submit <at> debbugs.gnu.org; Mon, 27 Nov 2023 14:26:50 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:41658
helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <saku@HIDDEN>) id 1r7hFo-0003tL-4E
for 67493 <at> debbugs.gnu.org; Mon, 27 Nov 2023 14:26:48 -0500
Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127])
by mail.laesvuori.fi (Postfix) with ESMTPSA id 9F8EE3400A9;
Mon, 27 Nov 2023 20:27:51 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
t=1701113272; bh=fX06KwU57MiHIOXCwxwUYwPvtb6a2HTKDBwkUo8H18U=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=QuDh7qysXLjPPLj5pj1FfKPMHXHv++4pX8W25N93fwXn8QM2eJ1UnAMZn5nRkfzQK
rEPdOanDOLxlzEcoekiP+rlw+SLMpsZ6NsEgb064PSumtjN7BatCnfcIwdlqp2Lu0N
aIuyCoBXMg1/wkiufYQ65GJlbDRa1TKeWQieI7Ug=
From: Saku Laesvuori <saku@HIDDEN>
To: 67493 <at> debbugs.gnu.org
Subject: [PATCH 1/6] gnu: Update glib-next to 2.78.1
Date: Mon, 27 Nov 2023 21:26:05 +0200
Message-ID: <4cdaa07f5e211c24798b36e2eef7d210dbc9625b.1701112690.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1701112690.git.saku@HIDDEN>
References: <cover.1701112690.git.saku@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Liliana Marie Prikler <liliana.prikler@HIDDEN>,
Maxim Cournoyer <maxim.cournoyer@HIDDEN>,
Raghav Gururajan <rg@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67493
Cc: Saku Laesvuori <saku@HIDDEN>
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 (-)
* gnu/packages/glib.scm (glib-next): Update to 2.78.1.
[patches]: Remove redundant patch.
[phases]<disable-failing-tests>: Disable new failing tests.
Change-Id: I0d4bab8248cd33fde35fecc1c2c07e2bdb83d733
---
gnu/packages/glib.scm | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index b5eb4602da..353cb95aaf 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -486,7 +486,7 @@ (define-public glib-next
(package
(inherit glib)
(name "glib")
- (version "2.73.3")
+ (version "2.78.1")
(source
(origin
(inherit (package-source glib))
@@ -494,11 +494,14 @@ (define-public glib-next
(string-append "mirror://gnome/sources/"
name "/" (string-take version 4) "/"
name "-" version ".tar.xz"))
+ (patches (filter (lambda (patch-file)
+ (not (string-suffix? "glib-skip-failing-test.patch" patch-file)))
+ (origin-patches (package-source glib))))
(snippet
'(substitute* "glib/tests/spawn-test.c"
(("/bin/sh") "sh")))
(sha256
- (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz"))))
+ (base32 "1ckqxmpiwvxbgm57bmy4m9cww3v7zgwf4ciqml76azahz38c6nwi"))))
(arguments
(substitute-keyword-arguments (package-arguments glib)
((#:test-options test-options ''())
@@ -520,8 +523,10 @@ (define-public glib-next
"desktop-app-info.c"
"file.c"
"gdbus-address-get-session.c"
- "gdbus-peer.c")
- (("[ \t]*g_test_add_func.*;") "")))
+ "gdbus-peer.c"
+ "gdbus-server-auth.c"
+ "portal-support-snap.c")
+ (("g_test_run.*;") "0;")))
#$@(if (target-x86-32?)
;; Comment out parts of timer.c that fail on i686 due to
--
2.41.0
liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, rg@HIDDEN, guix-patches@HIDDEN:bug#67493; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 27 Nov 2023 19:23:45 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Nov 27 14:23:45 2023 Received: from localhost ([127.0.0.1]:44827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1r7hCr-0003mx-Fk for submit <at> debbugs.gnu.org; Mon, 27 Nov 2023 14:23:45 -0500 Received: from lists.gnu.org ([2001:470:142::17]:47950) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <saku@HIDDEN>) id 1r7hCq-0003mi-0p for submit <at> debbugs.gnu.org; Mon, 27 Nov 2023 14:23:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <saku@HIDDEN>) id 1r7hCd-00064N-Rx for guix-patches@HIDDEN; Mon, 27 Nov 2023 14:23:32 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101] helo=mail.laesvuori.fi) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <saku@HIDDEN>) id 1r7hCc-0006vo-9Y for guix-patches@HIDDEN; Mon, 27 Nov 2023 14:23:31 -0500 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 439FE3400A9; Mon, 27 Nov 2023 20:24:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701113077; bh=Qw07IplADnHJSsR6wGlpEO4zTeBkxCmVlsL/yDup14I=; h=From:To:Cc:Subject:Date; b=M798EuZTcUmRheqmKuXElH+SEr6oFCBh5y0vONKPdI8uyhAOAzHZPDR55rA90mt+j PS3bBZMkCxVBIeO8Yk8E8Lxu+hkwYsV4r4W4vdz3dNEOzLyN2pzx4VSBDquz/03dD7 iS8EjWtsc23eEUp+na8ggGZScT153u2SKXQrJERk= From: Saku Laesvuori <saku@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH 0/6] Update telegram desktop Date: Mon, 27 Nov 2023 21:23:04 +0200 Message-ID: <cover.1701112690.git.saku@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=75.119.130.101; envelope-from=saku@HIDDEN; helo=mail.laesvuori.fi X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: Saku Laesvuori <saku@HIDDEN> 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: -0.1 (/) This series updates telegram-desktop to the latest version (4.11.8). Saku Laesvuori (6): gnu: Update glib-next to 2.78.1 gnu: Update glibmm-next to 2.77.0 gnu: Add expected-lite gnu: Add cppgir gnu: Update range-v3 to 0.12.0 gnu: Update telegram-desktop to 4.11.8 gnu/local.mk | 4 +- gnu/packages/cpp.scm | 26 +++- gnu/packages/glib.scm | 43 +++++- .../patches/range-v3-build-with-gcc10.patch | 122 ------------------ .../telegram-desktop-fix-lib-base-build.patch | 24 ++++ .../telegram-desktop-unbundle-cppgir.patch | 45 +++++++ .../telegram-desktop-unbundle-gsl.patch | 33 +++++ gnu/packages/telegram.scm | 99 ++++++++++---- 8 files changed, 236 insertions(+), 160 deletions(-) delete mode 100644 gnu/packages/patches/range-v3-build-with-gcc10.patch create mode 100644 gnu/packages/patches/telegram-desktop-fix-lib-base-build.patch create mode 100644 gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch create mode 100644 gnu/packages/patches/telegram-desktop-unbundle-gsl.patch base-commit: 9f67681db15d22f7ede5488315d52b78e357343e -- 2.41.0
Saku Laesvuori <saku@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#67493; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.