From patchwork Thu May 25 17:54:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 50330 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 10B0B27BBE9; Thu, 25 May 2023 18:55:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8984427BBE2 for ; Thu, 25 May 2023 18:55:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2FB6-0001ce-Tb; Thu, 25 May 2023 13:55:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2FB1-0001bk-Oy for guix-patches@gnu.org; Thu, 25 May 2023 13:55:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2FB1-0001Ju-4Z for guix-patches@gnu.org; Thu, 25 May 2023 13:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q2FB0-000521-Ua for guix-patches@gnu.org; Thu, 25 May 2023 13:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63706] [PATCH v2 1/3] gnu: c++-gsl: Update to 4.0.0 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 May 2023 17:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63706 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63706@debbugs.gnu.org Cc: Saku Laesvuori , liliana.prikler@gmail.com Received: via spool by 63706-submit@debbugs.gnu.org id=B63706.168503729519310 (code B ref 63706); Thu, 25 May 2023 17:55:02 +0000 Received: (at 63706) by debbugs.gnu.org; 25 May 2023 17:54:55 +0000 Received: from localhost ([127.0.0.1]:48041 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2FAs-00051H-QY for submit@debbugs.gnu.org; Thu, 25 May 2023 13:54:55 -0400 Received: from vmi571514.contaboserver.net ([75.119.130.101]:34532 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2FAq-00050u-6L for 63706@debbugs.gnu.org; Thu, 25 May 2023 13:54:53 -0400 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 6DC43340103; Thu, 25 May 2023 19:54:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1685037299; bh=MPjPnwLU92R/sqVy3wMFKOsuyUW7aHvCKDJNSnVm7Ko=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S7+Siq2iJu2egQwQcCwXR5TTVdwMcljVpc5TZYsz68vsrKfsan4IL0Bx+WY/i6kRS LpfW491FcHMJP7hlz5Iw2+LxaT88Gz222XURna8MzW+zWgEkmUsSbdD+PSk6JbHxkR u3lPKblJ8XLTfXw8p7EUgjWK3Ce+ef77zJjWcRrU= Date: Thu, 25 May 2023 20:54:41 +0300 Message-Id: <20230525175443.10827-1-saku@laesvuori.fi> X-Mailer: git-send-email 2.39.2 In-Reply-To: <7b5f5d605d53a90df35aae829c7ef34269fbc476.camel@gmail.com> References: <7b5f5d605d53a90df35aae829c7ef34269fbc476.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (c++gsl): Update to 4.0.0. * gnu/packages/patches/c++-gsl-find-system-gtest.patch: Delete file. * gnu/packages/patches/c++-gsl-move-array-bounds-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove deleted patches. --- gnu/local.mk | 2 - gnu/packages/cpp.scm | 8 +- .../patches/c++-gsl-find-system-gtest.patch | 96 ------------- .../c++-gsl-move-array-bounds-tests.patch | 126 ------------------ 4 files changed, 2 insertions(+), 230 deletions(-) delete mode 100644 gnu/packages/patches/c++-gsl-find-system-gtest.patch delete mode 100644 gnu/packages/patches/c++-gsl-move-array-bounds-tests.patch base-commit: 3c33f7072a190231183f90a463a429dbb0d3e8b9 diff --git a/gnu/local.mk b/gnu/local.mk index c10fb01bb3..32e0e3071f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1032,8 +1032,6 @@ dist_patch_DATA = \ %D%/packages/patches/curl-use-ssl-cert-env.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ - %D%/packages/patches/c++-gsl-find-system-gtest.patch \ - %D%/packages/patches/c++-gsl-move-array-bounds-tests.patch \ %D%/packages/patches/date-output-pkg-config-files.patch \ %D%/packages/patches/datefudge-gettimeofday.patch \ %D%/packages/patches/dbacl-include-locale.h.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 34ae9ef70e..64f923929e 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -224,7 +224,7 @@ (define-public range-v3 (define-public c++-gsl (package (name "c++-gsl") - (version "3.1.0") + (version "4.0.0") (source (origin (method git-fetch) @@ -235,12 +235,8 @@ (define-public c++-gsl (string-append "v" version)))) (file-name (git-file-name name version)) - (patches - (search-patches - "c++-gsl-find-system-gtest.patch" - "c++-gsl-move-array-bounds-tests.patch")) (sha256 - (base32 "0gbvr48f03830g3154bjhw92b8ggmg6wwh5xyb8nppk9v6w752l0")))) + (base32 "0dgb3rb6x2276d3v7x568m3zhqr67rhk8ynqgm3c304avnmcaw3i")))) (build-system cmake-build-system) (native-inputs (list googletest pkg-config)) diff --git a/gnu/packages/patches/c++-gsl-find-system-gtest.patch b/gnu/packages/patches/c++-gsl-find-system-gtest.patch deleted file mode 100644 index 2def650292..0000000000 --- a/gnu/packages/patches/c++-gsl-find-system-gtest.patch +++ /dev/null @@ -1,96 +0,0 @@ -From f5cf01083baf7e8dc8318db3648bc6098dc32d67 Mon Sep 17 00:00:00 2001 -From: Nicholas Guriev -Date: Sat, 18 Apr 2020 13:30:17 +0300 -Subject: [PATCH] Search for GoogleTest via pkg-config first - ---- - tests/CMakeLists.txt | 55 ++++++++++++++++++++++++-------------------- - 1 file changed, 30 insertions(+), 25 deletions(-) - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 02193197..53d475c2 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -1,36 +1,41 @@ - cmake_minimum_required(VERSION 3.0.2) - - project(GSLTests CXX) -+include(FindPkgConfig) - - # will make visual studio generated project group files - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - --configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt) --execute_process( -- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . -- RESULT_VARIABLE result -- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download --) --if(result) -- message(FATAL_ERROR "CMake step for googletest failed: ${result}") --endif() -+pkg_search_module(GTestMain gtest_main) -+if (NOT GTestMain_FOUND) -+ configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt) -+ execute_process( -+ COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . -+ RESULT_VARIABLE result -+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download -+ ) -+ if(result) -+ message(FATAL_ERROR "CMake step for googletest failed: ${result}") -+ endif() - --execute_process( -- COMMAND ${CMAKE_COMMAND} --build . -- RESULT_VARIABLE result -- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download --) --if(result) -- message(FATAL_ERROR "CMake step for googletest failed: ${result}") --endif() -+ execute_process( -+ COMMAND ${CMAKE_COMMAND} --build . -+ RESULT_VARIABLE result -+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download -+ ) -+ if(result) -+ message(FATAL_ERROR "CMake step for googletest failed: ${result}") -+ endif() - --set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) -+ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) -+ set(GTestMain_LIBRARIES gtest_main) - --add_subdirectory( -- ${CMAKE_CURRENT_BINARY_DIR}/googletest-src -- ${CMAKE_CURRENT_BINARY_DIR}/googletest-build -- EXCLUDE_FROM_ALL --) -+ add_subdirectory( -+ ${CMAKE_CURRENT_BINARY_DIR}/googletest-src -+ ${CMAKE_CURRENT_BINARY_DIR}/googletest-build -+ EXCLUDE_FROM_ALL -+ ) -+endif() - - if (MSVC AND (GSL_CXX_STANDARD EQUAL 17)) - set(GSL_CPLUSPLUS_OPT -Zc:__cplusplus -permissive-) -@@ -149,7 +154,7 @@ function(add_gsl_test name) - target_link_libraries(${name} - GSL - gsl_tests_config -- gtest_main -+ ${GTestMain_LIBRARIES} - ) - add_test( - ${name} -@@ -254,7 +259,7 @@ function(add_gsl_test_noexcept name) - target_link_libraries(${name} - GSL - gsl_tests_config_noexcept -- gtest_main -+ ${GTestMain_LIBRARIES} - ) - add_test( - ${name} diff --git a/gnu/packages/patches/c++-gsl-move-array-bounds-tests.patch b/gnu/packages/patches/c++-gsl-move-array-bounds-tests.patch deleted file mode 100644 index 0629212688..0000000000 --- a/gnu/packages/patches/c++-gsl-move-array-bounds-tests.patch +++ /dev/null @@ -1,126 +0,0 @@ -Description: Move tests that trigger -Warray-bounds to separate compilation unit - GCC 10 is now smart enough to detect violation of array boundaries that tests - are actually tested. Along with -Werror this led to tests failure, so I move - such tests to another compilation unit to have the warning deactivated for - only these tests. -Bug-Debian: https://bugs.debian.org/966895 -Author: Nicholas Guriev -Last-Modified: Wed, 19 Aug 2020 08:55:52 +0300 - ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -179,6 +179,7 @@ add_gsl_test(owner_tests) - add_gsl_test(byte_tests) - add_gsl_test(algorithm_tests) - add_gsl_test(strict_notnull_tests) -+add_gsl_test(array_bounds) - - - # No exception tests ---- /dev/null -+++ b/tests/array_bounds.cpp -@@ -0,0 +1,68 @@ -+/////////////////////////////////////////////////////////////////////////////// -+// -+// Copyright (c) 2015 Microsoft Corporation. All rights reserved. -+// -+// This code is licensed under the MIT License (MIT). -+// -+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -+// THE SOFTWARE. -+// -+/////////////////////////////////////////////////////////////////////////////// -+ -+#ifdef __GNUC__ -+#pragma GCC diagnostic warning "-Warray-bounds" -+#endif // __GNUC__ -+ -+#include -+ -+#include // for gsl::multi_span -+ -+namespace gsl -+{ -+struct fail_fast; -+} // namespace gsl -+ -+namespace -+{ -+static constexpr char deathstring[] = "Expected Death"; -+} // namespace -+ -+TEST(array_bounds, subspan_from_multi_span_test) -+{ -+ int arr[5] = {1, 2, 3, 4, 5}; -+ gsl::multi_span av = arr; -+ -+ std::set_terminate([] { -+ std::cerr << "Expected Death. subspan"; -+ std::abort(); -+ }); -+ -+ EXPECT_DEATH(av.subspan(6).length(), deathstring); -+} -+ -+TEST(array_bounds, strided_span_bounds_from_strided_span_tests) -+{ -+ int arr[] = {0, 1, 2, 3}; -+ gsl::multi_span av(arr); -+ -+ std::set_terminate([] { -+ std::cerr << "Expected Death. strided_span_bounds"; -+ std::abort(); -+ }); -+ -+ // incorrect sections -+ EXPECT_DEATH(av.section(0, 0)[0], deathstring); -+ EXPECT_DEATH(av.section(1, 0)[0], deathstring); -+ EXPECT_DEATH(av.section(1, 1)[1], deathstring); -+ -+ EXPECT_DEATH(av.section(2, 5), deathstring); -+ EXPECT_DEATH(av.section(5, 2), deathstring); -+ EXPECT_DEATH(av.section(5, 0), deathstring); -+ EXPECT_DEATH(av.section(0, 5), deathstring); -+ EXPECT_DEATH(av.section(5, 5), deathstring); -+} ---- a/tests/multi_span_tests.cpp -+++ b/tests/multi_span_tests.cpp -@@ -1042,10 +1042,6 @@ TEST(multi_span_test, subspan) - EXPECT_TRUE(av.subspan(1).length() == 4); - EXPECT_TRUE(av.subspan(4).length() == 1); - EXPECT_TRUE(av.subspan(5).length() == 0); -- // Disabled test instead of fixing since multi_span is deprecated. (PR#835) --#if !(defined(__GNUC__) && __GNUC__ == 8) -- EXPECT_DEATH(av.subspan(6).length(), deathstring); --#endif - auto av2 = av.subspan(1); - for (int i = 0; i < 4; ++i) EXPECT_TRUE(av2[i] == i + 2); - } ---- a/tests/strided_span_tests.cpp -+++ b/tests/strided_span_tests.cpp -@@ -403,20 +403,6 @@ TEST(strided_span_tests, strided_span_bo - }); - - { -- // incorrect sections -- -- EXPECT_DEATH(av.section(0, 0)[0], deathstring); -- EXPECT_DEATH(av.section(1, 0)[0], deathstring); -- EXPECT_DEATH(av.section(1, 1)[1], deathstring); -- -- EXPECT_DEATH(av.section(2, 5), deathstring); -- EXPECT_DEATH(av.section(5, 2), deathstring); -- EXPECT_DEATH(av.section(5, 0), deathstring); -- EXPECT_DEATH(av.section(0, 5), deathstring); -- EXPECT_DEATH(av.section(5, 5), deathstring); -- } -- -- { - // zero stride - strided_span sav{av, {{4}, {}}}; - EXPECT_TRUE(sav[0] == 0); From patchwork Thu May 25 17:54:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 50332 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8AB7A27BBE9; Thu, 25 May 2023 18:55:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E132627BBE2 for ; Thu, 25 May 2023 18:55:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2FB5-0001cP-I6; Thu, 25 May 2023 13:55:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2FB1-0001bj-O8 for guix-patches@gnu.org; Thu, 25 May 2023 13:55:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2FB0-0001Hx-Ku for guix-patches@gnu.org; Thu, 25 May 2023 13:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q2FB0-00051t-Fz for guix-patches@gnu.org; Thu, 25 May 2023 13:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63706] [PATCH v2 2/3] gnu: Add glibmm-2.76 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 May 2023 17:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63706 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63706@debbugs.gnu.org Cc: Saku Laesvuori , liliana.prikler@gmail.com Received: via spool by 63706-submit@debbugs.gnu.org id=B63706.168503729419302 (code B ref 63706); Thu, 25 May 2023 17:55:02 +0000 Received: (at 63706) by debbugs.gnu.org; 25 May 2023 17:54:54 +0000 Received: from localhost ([127.0.0.1]:48039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2FAs-00051F-Gg for submit@debbugs.gnu.org; Thu, 25 May 2023 13:54:54 -0400 Received: from vmi571514.contaboserver.net ([75.119.130.101]:34534 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2FAq-00050v-Fi for 63706@debbugs.gnu.org; Thu, 25 May 2023 13:54:52 -0400 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id B2E36342F8A; Thu, 25 May 2023 19:54:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1685037299; bh=d4Rubhbcs3bSCl43BAOHfP5APfgPjc33qfEnf3n9y9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RrxqsmFBW/CMgwhQGST9yNPL250fu7TyOKJbhGI13WGsTPzM99S/Vj/KTZPg1YM4B bqbqQFbBAy8XKMjqVlE5ImkVTMI/026kDUQ8SYBc1YWPbum+GOQ9nSg+Hjm3jP6SNh SJ2j4sqYOClX5TbsdwAsNKl4AulROrKYQrMWa9GE= Date: Thu, 25 May 2023 20:54:42 +0300 Message-Id: <20230525175443.10827-2-saku@laesvuori.fi> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230525175443.10827-1-saku@laesvuori.fi> References: <7b5f5d605d53a90df35aae829c7ef34269fbc476.camel@gmail.com> <20230525175443.10827-1-saku@laesvuori.fi> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/glib.scm (glibmm-2.76): New variable. --- gnu/packages/glib.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 1f3d3ef628..b50e251b5c 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -913,6 +913,23 @@ (define glibmm useful for C++.") (license license:lgpl2.1+))) +(define-public glibmm-2.76 + (package + (inherit glibmm) + (version "2.76.0") + (name "glibmm") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/glibmm/" + (version-major+minor version) + "/glibmm-" version ".tar.xz")) + (sha256 + (base32 + "1cia8vrpwzn8zwalws42mga5hi965840m5s8dvfzv55xx86dhdw6")))) + (propagated-inputs + (modify-inputs (package-propagated-inputs glibmm) + (replace "glib" glib-next))))) + (define-public glibmm-2.64 (package (inherit glibmm) From patchwork Thu May 25 17:54:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 50331 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C8B3D27BBEA; Thu, 25 May 2023 18:55:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4F4B127BBE2 for ; Thu, 25 May 2023 18:55:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2FBC-0001en-4W; Thu, 25 May 2023 13:55:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2FB1-0001bl-UR for guix-patches@gnu.org; Thu, 25 May 2023 13:55:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2FB1-0001Ox-M5 for guix-patches@gnu.org; Thu, 25 May 2023 13:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q2FB1-000528-Ha for guix-patches@gnu.org; Thu, 25 May 2023 13:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63706] [PATCH v2 3/3] gnu: telegram-desktop: Update to 4.8.1 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 May 2023 17:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63706 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63706@debbugs.gnu.org Cc: Saku Laesvuori , liliana.prikler@gmail.com Received: via spool by 63706-submit@debbugs.gnu.org id=B63706.168503729619317 (code B ref 63706); Thu, 25 May 2023 17:55:03 +0000 Received: (at 63706) by debbugs.gnu.org; 25 May 2023 17:54:56 +0000 Received: from localhost ([127.0.0.1]:48043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2FAt-00051P-Lr for submit@debbugs.gnu.org; Thu, 25 May 2023 13:54:56 -0400 Received: from vmi571514.contaboserver.net ([75.119.130.101]:34546 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2FAq-00050w-Nn for 63706@debbugs.gnu.org; Thu, 25 May 2023 13:54:54 -0400 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 0618C342F8B; Thu, 25 May 2023 19:54:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1685037300; bh=2OR6T2jdE8dqi/yXFKyD9hC9CWu6tnam3Kw4UoX6dOE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DkpOaGd3yrQa+h+P8uOfPa3TDeIVh8GN627UzBdAscnDIwwaeSoIDEiMNTmg5DEhs P6sgWhwckAILcihYmzmKN5OpFmInjAhE383nL65HCBlyCCynXJd67cXSRfErBRwrYd nOAJWaYXAFGVbTgF3fY2mVNE6LH7Soqfv5TluV7U= Date: Thu, 25 May 2023 20:54:43 +0300 Message-Id: <20230525175443.10827-3-saku@laesvuori.fi> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230525175443.10827-1-saku@laesvuori.fi> References: <7b5f5d605d53a90df35aae829c7ef34269fbc476.camel@gmail.com> <20230525175443.10827-1-saku@laesvuori.fi> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove deleted patch. * 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-rpl-for-telegram-desktop, lib-spellcheck-for-telegram-desktop, lib-ui-for-telegram-desktop, lib-webrtc-for-telegram-desktop, lib-webview-for-telegram-desktop, tgcalls-for-telegram-desktop): Bump to submodule checkout. (webrtc-for-telegram-desktop): Bump to submodule checkout. [patches]: Remove patch. [snippet]: Unbundle abseil-cpp and crc32c [inputs]: Add crc32c and glibmm-2.76. Replace glib with glib-next. (cld3-for-telegram-desktop): New variable. (telegram-desktop): Update to 4.8.1 [snippet]: Add cld3 as a submodule. [arguments]: Add cld3 as a submodule. [native-inputs]: Replace glib with glib-next [inputs]: Add crc32c, kimageformats, plasma-wayland-protocols, protobuf, qtdeclarative-5 and wayland-protocols. Replace glib with glib-next and glibmm-2.64 with glibmm-2.76. * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: Update patch. --- gnu/local.mk | 1 - ...gram-desktop-allow-disable-libtgvoip.patch | 28 ++--- ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 ---- gnu/packages/telegram.scm | 103 ++++++++++-------- 4 files changed, 74 insertions(+), 79 deletions(-) delete mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index 32e0e3071f..4dc64e6d29 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2045,7 +2045,6 @@ dist_patch_DATA = \ %D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ - %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ diff --git a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch index 3c062cbd9a..a603bc9d72 100644 --- a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -1,4 +1,4 @@ -From 4d1a8351ee82728912fcf7ad0070049b2910c393 Mon Sep 17 00:00:00 2001 +From 322d2c452bf1a4df7b9fe161d4991a347043550c Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Wed, 2 Mar 2022 01:07:48 +0100 Subject: [PATCH] Introduce TDESKTOP_DISABLE_LEGACY_TGVOIP @@ -19,10 +19,10 @@ and telegram desktop/mobile versions without problems. 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt -index fb2bf370f..5d9578f2d 100644 +index 008c71b15..291305909 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt -@@ -28,7 +28,9 @@ get_filename_component(res_loc Resources REALPATH) +@@ -26,7 +26,9 @@ get_filename_component(res_loc Resources REALPATH) include(cmake/telegram_options.cmake) include(cmake/lib_ffmpeg.cmake) include(cmake/lib_stripe.cmake) @@ -33,7 +33,7 @@ index fb2bf370f..5d9578f2d 100644 include(cmake/lib_tgcalls.cmake) include(cmake/td_export.cmake) include(cmake/td_mtproto.cmake) -@@ -52,9 +54,7 @@ target_prepare_qrc(Telegram) +@@ -49,9 +51,7 @@ set_target_properties(Telegram PROPERTIES AUTOMOC ON) target_link_libraries(Telegram PRIVATE @@ -44,7 +44,7 @@ index fb2bf370f..5d9578f2d 100644 # Order in this list defines the order of include paths in command line. # We need to place desktop-app::external_minizip this early to have its diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp -index 6894d5d90..cd03620e7 100644 +index 5fe9ac677..bebf48e70 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp @@ -39,8 +39,10 @@ class InstanceImpl; @@ -68,7 +68,7 @@ index 6894d5d90..cd03620e7 100644 [[nodiscard]] base::flat_set CollectEndpointIds( const QVector &list) { -@@ -1322,7 +1326,9 @@ Call::~Call() { +@@ -1332,7 +1336,9 @@ Call::~Call() { } void UpdateConfig(const std::string &data) { @@ -79,10 +79,10 @@ index 6894d5d90..cd03620e7 100644 } // namespace Calls diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake -index 34a5ba418..8a784be2c 100644 +index 94cfdb856..9ac4fe479 100644 --- a/Telegram/cmake/lib_tgcalls.cmake +++ b/Telegram/cmake/lib_tgcalls.cmake -@@ -267,6 +267,10 @@ PRIVATE +@@ -268,6 +268,10 @@ PRIVATE ${tgcalls_loc} ) @@ -94,7 +94,7 @@ index 34a5ba418..8a784be2c 100644 init_target(lib_tgcalls_legacy) diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake -index 1c3c25431..033f2bc95 100644 +index a5a6d9405..2eb9953f2 100644 --- a/Telegram/cmake/telegram_options.cmake +++ b/Telegram/cmake/telegram_options.cmake @@ -4,7 +4,9 @@ @@ -107,7 +107,7 @@ index 1c3c25431..033f2bc95 100644 set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.") set(TDESKTOP_API_HASH "" CACHE STRING "Provide 'api_hash' for the Telegram API access.") -@@ -40,6 +42,12 @@ if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "") +@@ -36,6 +38,12 @@ if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "") " ") endif() @@ -117,9 +117,9 @@ index 1c3c25431..033f2bc95 100644 + target_link_libraries(Telegram PRIVATE tdesktop::lib_tgcalls_legacy tdesktop::lib_tgvoip) +endif() + - if (DESKTOP_APP_DISABLE_SPELLCHECK) - target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_SPELLCHECK) - else() + if (DESKTOP_APP_DISABLE_AUTOUPDATE) + target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_AUTOUPDATE) + endif() -- -2.37.3 +2.39.2 diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch deleted file mode 100644 index f1fd29d0d3..0000000000 --- a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 -From: Xiretza -Date: Sun, 15 May 2022 12:47:41 +0200 -Subject: [PATCH] fix(h265_pps_parser): fix missing cstdint include - ---- - src/common_video/h265/h265_pps_parser.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/common_video/h265/h265_pps_parser.h b/src/common_video/h265/h265_pps_parser.h -index 28c95ea9..c180b1b9 100644 ---- a/src/common_video/h265/h265_pps_parser.h -+++ b/src/common_video/h265/h265_pps_parser.h -@@ -12,6 +12,7 @@ - #define COMMON_VIDEO_H265_PPS_PARSER_H_ - - #include "absl/types/optional.h" -+#include - - namespace rtc { - class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index c6ab5d312c..38a702d5dc 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -78,11 +78,11 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define %telegram-version "4.2.2") +(define %telegram-version "4.8.1") (define libyuv-for-telegram-desktop - (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") - (revision "2211")) + (let ((commit "00950840d1c9bcbb3eb6ebc5aac5793e71166c8b") + (revision "2212")) (origin (method git-fetch) (uri (git-reference @@ -93,62 +93,62 @@ (define libyuv-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) + "0mm56p8iapfild2xdw4w8zi35c3xm06fgagiali644gnxdmnym6c"))))) (define cmake-helpers-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "f49e254d8c5287752b5ed7b86bd84073f584768e"))) + (commit "6ab5543b3dd1e40979d258e46d03376931b6c37b"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0yqib2ndhpaj69z603knpcfga0ni978janb5i8rvhslqddvbzfjv")))) + "0y96mvzs113zh8bdw1h3i6l0pgwg93rigrday8kfdg4magz686k6")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c"))) + (commit "1a969faa0afb29d53af03e530775eccdfb8433f1"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2")))) + "1xmw8dfm51p5g20rlmzqnr72a14ngyxwq09an8clf1v5s6mmwvak")))) (define lib-base-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_base.git") - (commit "d932f5048317b05dd414116741d995c82a528542"))) + (commit "fd9adb30ee906ea02c125eaa58fcfae773fdc677"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1fnirqxj4qq1gzx52rydrc5r6clw3316bh51dfg652jr8hj6wkp2")))) + "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83")))) (define lib-crl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_crl.git") - (commit "4e620bc383d032aadea8e6af02661f8c76695cec"))) + (commit "3d7e1e1f1321c3defd21c01882d674e485ecd8df"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x")))) + "06mzafnjpfr5ih297dh7bxm6bgpg0wy0gv2r2732n5szyrg9sdl6")))) (define lib-lottie-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_lottie.git") - (commit "6ed1c22ed60692d2f288c9222fafd7d5cd62f904"))) + (commit "3e9c2f1026e4b5aa3202fca4cc67ece36c7cebb2"))) (file-name (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) (sha256 @@ -172,24 +172,24 @@ (define lib-rpl-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_rpl.git") - (commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe"))) + (commit "8b1015d1bd57ef03fcd07a3eeddd3f5a9b688ade"))) (file-name (git-file-name "lib-rpl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf")))) + "12sdhaqby5vlvd5jsj12b3xsqiaknqvijv9ydlyxclx8zail64lv")))) (define lib-spellcheck-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "0e386e22cb6ba8a114b569840a635e096dcb645e"))) + (commit "ae89fefd239ecc47d4dab7ba29f9e230376a57d3"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "06js7ccv6z3nbd4v2p4hp2prrlmz5ww46y3yb922pp7gm317dwyw")))) + "147xbbcza5q4wcdipk5jplajzkc48971kg2s7qv5jlz33sxkw1lq")))) (define lib-storage-for-telegram-desktop (origin @@ -220,52 +220,52 @@ (define lib-ui-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "1ceaa0bbcfccb83dbf7f51d7f80a733ff2aa8c22"))) + (commit "37531086ec21a8569deddedb11b402f8a3157b90"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0kyrgxi202xwy14mnx62h1kny0434f5fxqns1ydp24q2c2cr1cxn")))) + "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0")))) (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a"))) + (commit "b68a95ad4d1ae9a1827671100a7fd76cbe448c3f"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq")))) + "1c8jwdnn26n13yp0rp0l71q6xlxa6wp3cspbm3pnghw964jwgp3z")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35"))) + (commit "f632fc84cbc62ae8abbbd05f81d472757a337c11"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l")))) + "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "82c4921045c440b727c38e464f3a0539708423ff"))) + (commit "2e2797648aac2588e7fe479c2e8b4455ec65c5e6"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk")))) + "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") - (revision "327")) + (let ((commit "5098730b9eb6173f0b52068fe2555b7c1015123a") + (revision "328")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -281,18 +281,14 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "1ks1572k1jj7pmzwm79p2gdgi31dd4bs761bphnx32zyq4c6skxk")) - (patches - (search-patches - ;; https://github.com/desktop-app/tg_owt/pull/101 - "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch")) + (base32 "1lk54zlrff59rj5k9dylsgz4sdds4728psrk8m3v9qn5y8d6z8qy")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '("abseil-cpp" "libsrtp" "rnnoise" + '("libsrtp" "rnnoise" ;; Not available in Guix. "pffft"))) (with-directory-excursion "src/third_party" @@ -300,9 +296,11 @@ (define-public webrtc-for-telegram-desktop (lset-difference string=? (scandir ".") (cons* "." ".." keep))))) - ;; Unbundle openh264. + ;; Unbundle abseil-cpp, crc32c and openh264. (substitute* "CMakeLists.txt" - (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"") + (("\\include\\(cmake\\/libabsl\\.cmake\\)")"") + (("\\include\\(cmake\\/libcrc32c\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments (list @@ -312,16 +310,16 @@ (define-public webrtc-for-telegram-desktop (add-after 'unpack 'unpack-additional-sources (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (crc32c-to (string-append third-party "/crc32c/src")) (libyuv-to (string-append third-party "/libyuv"))) - (copy-recursively #$(package-source crc32c) crc32c-to) (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) (native-inputs (list pkg-config python-wrapper yasm)) (inputs (list abseil-cpp-cxxstd17 + crc32c ffmpeg - glib + glib-next + glibmm-2.76 libdrm libglvnd libjpeg-turbo @@ -381,6 +379,18 @@ (define-public rlottie-for-telegram-desktop (substitute* "meson.build" (("werror=true") "werror=false")))))))))) +(define cld3-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/cld3.git") + (commit "b48dc46512566f5a2d41118c8c1116c4f96dc661"))) + (file-name + (git-file-name "cld3-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0ayrrhfdwrf4260h9fsirkhhfrcvc3qqnh6h9wj3ixij2lq0wwqb")))) + (define-public telegram-desktop (package (name "telegram-desktop") @@ -396,7 +406,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "16mcx4gwkl8s70a8gppxczmjsww1a3vmdrz3snfh986nvid64mq7")) + (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) (patches (search-patches ;; https://github.com/telegramdesktop/tdesktop/pull/24126 @@ -408,7 +418,7 @@ (define-public telegram-desktop #~(begin (let ((keep '(;; Not available in Guix. - "tgcalls"))) + "tgcalls" "cld3"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -461,13 +471,14 @@ (define-public telegram-desktop ("Telegram/lib_ui" #$lib-ui-for-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))))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list `(,glib "bin") + (list `(,glib-next "bin") `(,gtk+ "bin") pkg-config python-wrapper)) @@ -475,16 +486,18 @@ (define-public telegram-desktop (list abseil-cpp-cxxstd17 alsa-lib c++-gsl + crc32c fcitx-qt5 fcitx5-qt ffmpeg - glib - glibmm-2.64 + glib-next + glibmm-2.76 gtk+ hime hunspell jemalloc kcoreaddons + kimageformats libdispatch libexpected libjpeg-turbo @@ -496,9 +509,12 @@ (define-public telegram-desktop openal openssl opus + plasma-wayland-protocols pulseaudio + protobuf qrcodegen-cpp qtbase-5 + qtdeclarative-5 qtimageformats qtsvg-5 qtwayland-5 @@ -506,6 +522,7 @@ (define-public telegram-desktop rlottie-for-telegram-desktop rnnoise wayland + wayland-protocols webkitgtk webrtc-for-telegram-desktop xcb-util-keysyms