Received: (at 63706-done) by debbugs.gnu.org; 3 Jun 2023 11:23:40 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jun 03 07:23:40 2023 Received: from localhost ([127.0.0.1]:41668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1q5PMC-0002HW-FP for submit <at> debbugs.gnu.org; Sat, 03 Jun 2023 07:23:40 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1q5PMB-0002HN-Ka for 63706-done <at> debbugs.gnu.org; Sat, 03 Jun 2023 07:23:39 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 4A73C27BBE2; Sat, 3 Jun 2023 12:23:38 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id ec38562f; Sat, 3 Jun 2023 11:23:37 +0000 (UTC) References: <7b5f5d605d53a90df35aae829c7ef34269fbc476.camel@HIDDEN> <20230525175443.10827-1-saku@HIDDEN> User-agent: mu4e 1.10.2; emacs 28.2 From: Christopher Baines <mail@HIDDEN> To: Saku Laesvuori <saku@HIDDEN> Subject: Re: [bug#63706] [PATCH v2 1/3] gnu: c++-gsl: Update to 4.0.0 Date: Sat, 03 Jun 2023 12:23:14 +0100 In-reply-to: <20230525175443.10827-1-saku@HIDDEN> Message-ID: <87jzwk6b7q.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 63706-done Cc: liliana.prikler@HIDDEN, jonathan.brielmaier@HIDDEN, 63706-done <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 (-) --=-=-= Content-Type: text/plain Looks like this patch series has been merged, so marking as done. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmR7IrlfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfdKw/+NKYLVPS/cVrhgnKspIc4XAg1V2nVKPk1 +JUJWdjXD0owjWnYre+Ck09XbrUX1orbXtpeAPTf4YXQ+Lo1RT38mtaL4W7t7GVT sh9vrf+PUe9goiU0e0m99EdO0C+o6CsCDgHIpwRkbEJk4RC4kyY+HysC0x+IcSz7 RB18UFedDTD0ikcQ8sOv9JTpwLxGs8YNh2qTt8PVICv4E9e1yRRtzyqZnUk9wj2p gDl37vXp8DqzwTof4QPVWBDU5khSeNhoaeytjeq1x8ODxcZMHpsN5MOHkqhFO/uE E+ozdxwtFDRJKDzhO74z0SDZgPiUy6BY4LKdpi9QuqXuRAHVVeGeRrURn9Sy1FnF mnAJW1tMasjmI2+fvsqJRqdwwIxex0qIRiNy/6r7Y2hnjUeibv9MMuVcJGMlhbdn VFwcAqp8b9uNXiZO3O2UF71OQ5vY7afIGYKP5lQ9wGR2N9N53S/soIvHctXUx9XB 4YAz3wk2JtjfQftCSM4/Hui0yo/TxRl5jmWbjOz/JPQDTDsLN/qhoIQUcO0qyqeW C5esGiBrsYCQ6VmVC9sH1Uka+mk6K4Z50nIy8WRIsZ9g/XDBKI2PEvkn4XkFyjmK /sunuAivcxgNcdQAzqSNcK1Vk5AyiTK+R9XXi8s12juKo/jxDUeKNG9paKV7OPjA kpL0LiJTn3w= =EQmH -----END PGP SIGNATURE----- --=-=-=--
guix-patches@HIDDEN:bug#63706; Package guix-patches.
Full text available.Received: (at 63706-done) by debbugs.gnu.org; 28 May 2023 11:24:41 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 28 07:24:41 2023 Received: from localhost ([127.0.0.1]:53364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1q3EVt-0004Qu-Hz for submit <at> debbugs.gnu.org; Sun, 28 May 2023 07:24:41 -0400 Received: from mout.web.de ([212.227.15.3]:46669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <jonathan.brielmaier@HIDDEN>) id 1q3EVo-0004Qf-M1 for 63706-done <at> debbugs.gnu.org; Sun, 28 May 2023 07:24:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1685273070; x=1685877870; i=jonathan.brielmaier@HIDDEN; bh=8MWM/IEBM89V+1dhAmiYhsftUweWS/X1zHIDoVBEYz8=; h=X-UI-Sender-Class:Date:To:Subject:From; b=O6zercv4mKu+hhDTOzs9h84c+cTmkm7xVLtkU/byTY5WtLva5IbVjro4JfLGFAlh3GPf39E fDZ9VoonwLvZ7qbS/Bqc6VWTG+Z+VEmnP2a4SXN//dq/LkEfOMuanon62b23bvvaisrNjRnTE aolnR7ME954fCU2jTmYCLZTQusjQZ9VqJ8qJoGSDgRgVX1JxP/CfsQMqJmhJqsLsaSqQhFQm+ r8ZCLhPsQwK2rBiZ2lylgBBL2uJgLd2LXCc80e3CehzMWHIFqCrAJbznGhERqIUNNPjOUCbvl PunwOwA4b6assQb622J+v9JWAzgFUTRlhNL27WchxiZon+U15rqQ== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.23] ([77.190.49.225]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1Mvbms-1qLasC3YQA-00syzx for <63706-done <at> debbugs.gnu.org>; Sun, 28 May 2023 13:24:30 +0200 Message-ID: <7fcd47c0-da5e-f2d1-9847-016ffcc6ecf2@HIDDEN> Date: Sun, 28 May 2023 13:24:30 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 To: 63706-done <at> debbugs.gnu.org Subject: [PATCH] gnu: telegram-desktop: Update to 4.8.1 Content-Language: de-DE, en-US From: Jonathan Brielmaier <jonathan.brielmaier@HIDDEN> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:GPvYmTd+MeHrk8W82CUxULncQJ2hfSl4MnOvZT4nk6meUNVlIi5 1Znkr/ajCqIIM1n6zLsi2yKBv6XSqIM5PpC+1wl8et6GdVLDxUUzdmp0kzlvcDYIy1eF9h1 BhmDVo5Ij51rj9BTsL/yw4OnbDRhpNhOvoRNqvbLZdELiWqCoK8hgdqjYJwvuRKPrPty1IC BQCxl8C3P99E+xPl3I0Mg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:xy6wfCo4vBs=;SYTfmWZ6OR+4SLXNkzOPAsfb7HR e89PyO+3PWVFdLZkTUGbWBcztvFivU9p4ftklFXdh/TCkO3d5YZJkCoqoFCmTt/urYjt7v+2N WsIw9s2uqAeZXXDtqNx3ECYByMJ+ZuIyRxxeWIfMTK6uLn7AQ6uy27J51xehfEcldwznfeUf0 1WC7dlN6/xgH46jScekyricVe5p3AMwzb85Xu8izTadnRuXUk4VP3t2d/hmy1ogP8UWUolrl1 vBRyliMCz5RWuHAc6rwDlRl7tiwIRKiBsXT5ufXQeFwCDFjuZrtb7bBC+G5shtyM6zcmDfDWh JAb9rY4xIFsCVsoqXtr0nsQ13QhaUJlMmYyzTdTalccZ9KLRyhdXGz2pYrUqbSw8sfVgKWM0v GiNuO1flIivRaPaRMVDrTu799ovF1b3KiEENbuwrm0Ng4Aa/GlwazJc04/bZ6Uj1K+stXJjp4 w0iJtO0D4+7XDD6TCOUZpUgV4FlGzvnpQrYw44ELDHbXfxQmDspWr5abfNWPVUHa6M73RFxs3 WCRIWxyXXUIDy7mgVaaZXPapjI+a5COCmBhbjemWUrRi6+fzrHlB7N8tLSxrHt35NYFDz8Ns5 iLJv1s9SLrFoxMunF35gMqLI0aTD7EvMpJVH8TSQm+lP4REzDPZUQh5i8CN4rgrVOQBRjNAO9 WCCcfleF5TtCrusQZCB1ncTbtr1/YuVPEnL8cqRRZNVP3Qa5RCO8opsqOt0cjAExnqS++WLGQ PiP4ifP9xBHDIgJbpuSFrPm7/VC+guGTtWQkDpl2+HZTpMLQh9vrBqOscvVIBhm7/gbZivAe1 nnzDN2AHAGd2VWcwBMp5IoActBCFYVRpfEvrYoEWMkoIHLlKzLmlWCxtLkUU2a2ikVLSRO/h1 oEUD9t0Y3iefaJsRrveXUp4LkK6e/T7B8XDgzh7/oY9bCn17ahaBZ4h+TweilT+YK3nBqKBaO yGgsUQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 63706-done 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 (-) Hi Saku, I'm running telegram-desktop from this patch for two days now, no issues so far. Your patch-set is well done. I went ahead and pushed it starting as c10c24e9567643b8dc46ad62ad3b6c779553e833. Nice work! ~Jonathan
Saku Laesvuori <saku@HIDDEN>:Jonathan Brielmaier <jonathan.brielmaier@HIDDEN>:Received: (at 63706) by debbugs.gnu.org; 28 May 2023 00:03:47 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 27 20:03:47 2023 Received: from localhost ([127.0.0.1]:52723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1q33sx-0006Cv-Hu for submit <at> debbugs.gnu.org; Sat, 27 May 2023 20:03:47 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:53574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>) id 1q33sv-0006Ch-VD for 63706 <at> debbugs.gnu.org; Sat, 27 May 2023 20:03:46 -0400 Received: by mail-ed1-f65.google.com with SMTP id 4fb4d7f45d1cf-5147aee9d7cso2594483a12.3 for <63706 <at> debbugs.gnu.org>; Sat, 27 May 2023 17:03:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685232220; x=1687824220; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=sw6hGIkUCPNwYukL1QeYANcDcNMPwIOUtBEz9PsdjCY=; b=IAul472d3OQW5y5vEPhbdnazjFWoTbIp+Rn8sGyyqutckymJhjPOfe/0FsQD3asQuT Z4RhIwLYvXQAJWVoNl1VyVUQ+TccVe1la/wkJrlzzmB/6TWD0o+4oA7py/wA+dsi3x5s BDXbkR1AckikH7jf3AcuMjAfxrfSOWk+2u6mKXmdRfndZ3LEsUG8dyxM3USLacauGuMi sQ1XUGieRXFReFFtDHxqpVCWOp2ipJSu+41DfqG3eoOqNL6kbgHsqNsGYGoH4Mn5fgBh wSNrU6WWikk5PYYHm7Nceo9zlBWoKQEe2b6WCkfm7iTxD/t5JZkmUpO5LXQZIUGSKSW3 Q1DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685232220; x=1687824220; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=sw6hGIkUCPNwYukL1QeYANcDcNMPwIOUtBEz9PsdjCY=; b=cgpum8qqL4hZp3ratz7ZeR9tbL1hiavt+FaeqyE2zt8PjwTPBQvFIOu4LE0pTzgqF4 b8MRXs7Xg1Fx0QfQYJPrzmDvGxHCbX/ILsEFQVAN5R1smSwo1bHUChdL1sp6u1RVudDt aH0Xl7gKEHUYBwuKeJ4pHV1FQS+bhvQF0wweoQgwKoDJZ9x6VPPwOa3C09RLGH0A2dt4 LD8RRpGzJ1ERQyLfxfGSCuhpYU6SKozVeh4Jsq6ApMIgE7KW6t+pz9SU9OOZNwjNVdDr e6ve68+4K0vgYBrtccqw8yJNaoJoTqgzsWM+txLkbC4iZPi8+zgp/tyDY8qNvddkXjAo 5TSg== X-Gm-Message-State: AC+VfDxpxiCgR5+G13KwM7L2RDSkXuPbNYFCAT71gKFiC9QCu+NFpccd cs+aaIsag1AMjWu7Jf2dOF0= X-Google-Smtp-Source: ACHHUZ4n7k+V/JDTh1jXHXF6JZ41wzxERBA/HHG1v02bSAgK6v1VYTXkmUXLSxdKxfY8NEimt/677A== X-Received: by 2002:a17:907:6ea3:b0:96f:cf25:4bb8 with SMTP id sh35-20020a1709076ea300b0096fcf254bb8mr7211705ejc.32.1685232219914; Sat, 27 May 2023 17:03:39 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id mj22-20020a170906af9600b00971433ed5fesm3952011ejb.184.2023.05.27.17.03.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 May 2023 17:03:39 -0700 (PDT) Message-ID: <466dbb68dec6b53de69ffa50720774d0e553b2ab.camel@HIDDEN> Subject: Re: [PATCH] gnu: telegram-desktop: Update to 4.8.1 From: Liliana Marie Prikler <liliana.prikler@HIDDEN> To: Jonathan Brielmaier <jonathan.brielmaier@HIDDEN>, 63706 <at> debbugs.gnu.org Date: Sun, 28 May 2023 02:03:38 +0200 In-Reply-To: <80f63fe2-c0a3-cc88-7bb5-30aeff1e3b37@HIDDEN> References: <80f63fe2-c0a3-cc88-7bb5-30aeff1e3b37@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63706 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 (-) Am Freitag, dem 26.05.2023 um 10:51 +0200 schrieb Jonathan Brielmaier: > Hi Saku, >=20 > thanks for the patch. I tried updating telegram-desktop to 4.8.1 but > it somehow never compiled. Do you, by chance, suffer from a weak machine? (If so, me too.) Telegram's compilation footprint is probably on par with if not worse than Webkit. Exhausting all memory is a pretty normal failure mode in my experience. > All patches do build and telegram runs fine. I could hopefully review > them, add copyright lines for yourself and push them tomorrow if > Liliana is not faster :) I'm not ;) I wait at least a week before pushing nontrivial changes (and even trivial changes I queue up when I encounter them in the middle of the week). Plus, I do need to start/continue work on two team branches, so any help is much appreciated. Cheers
guix-patches@HIDDEN:bug#63706; Package guix-patches.
Full text available.Received: (at 63706) by debbugs.gnu.org; 26 May 2023 08:51:12 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri May 26 04:51:12 2023 Received: from localhost ([127.0.0.1]:48792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1q2TAG-0002iA-6D for submit <at> debbugs.gnu.org; Fri, 26 May 2023 04:51:12 -0400 Received: from mout.web.de ([212.227.15.3]:34069) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <jonathan.brielmaier@HIDDEN>) id 1q2TAC-0002hm-MY for 63706 <at> debbugs.gnu.org; Fri, 26 May 2023 04:51:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1685091062; x=1685695862; i=jonathan.brielmaier@HIDDEN; bh=PQaC2wKkQ9BQTzi35Fpns6YmU6b49MW1Olq8qmp/Jl0=; h=X-UI-Sender-Class:Date:To:Subject:From; b=wxbubnUsN4iC8Ig2BG3MX8fFBJ1A4zxPMp1PxpEE/giTqJ0sE3J7hlBNSIBirzXYDMI6im7 rNUrikKARRra8W2JJZw9e8fooARnB8EJZi016Od5lv7h1wt0/ngf683PFP5++PmXYHL6x6Pjt aL152Shs6WOGVlguJIp25jQLuuQMe/upZAevkeTRxY8cBGK7v0fu7sXpKRPVvE9cPvk2mCjBV IQNeQNw5PqqXevMQL7KYeCSBGDEkF04fMrg0rrzUG/Vced1OMndgPA0bdUnCUMdxiPexnA+NE dYfN+cp5TGl6UpPMaPg4orcP89Q6yXFzbSH8sREFfiuyLTp1z4lA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.23] ([77.15.16.253]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MBSB9-1pxlvN1xx1-00Cxky for <63706 <at> debbugs.gnu.org>; Fri, 26 May 2023 10:51:02 +0200 Message-ID: <80f63fe2-c0a3-cc88-7bb5-30aeff1e3b37@HIDDEN> Date: Fri, 26 May 2023 10:51:02 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 To: 63706 <at> debbugs.gnu.org Subject: [PATCH] gnu: telegram-desktop: Update to 4.8.1 Content-Language: de-DE, en-US From: Jonathan Brielmaier <jonathan.brielmaier@HIDDEN> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:87jxd04tD0TYJ90PbFHYeN9CDf71VQR9ypgXMcEyz4E0qS5sd5t 9X9kWxkmMvzgvdi0Qp07YDEyI28oqhXfcC1VUwCRoAv0lJcDwrjrbkbs5Jc8AtlVwU+CGdT +Z9fmcqDGIw9l9GhBmrjkd7ZA8J8+nYnNAIs1MFKngKS37Wcr9nV26Zmv0BiRFAHy0Tx59v 7FQtrLeyq+3Dzwh+veq6w== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:kx5shxMEJTU=;9BPcncQjqHiAZ4HJxS1A8la4X75 NWDfb7AIXGEM852X4DLKFY+gEqq9yN/+oIOA4dCQWmboZjrsHaCLKH5zb45Put16sMsYoBDMY CmkczFrlQYNyuQ36Fqttsv82xmkJ1LbNGfIFseEG7V19xvacodNQJyEGaGpvmm+EbxSjG+Hd5 ReuaQj2RRky5J5JgeYNRcCru/RJlL+4TO44X41rcPcXWkOnB760kcQCzYvb0ROFfvVMZxZGFu EsnEvz5tTsapNLZ+HfzZ4b38exn+rowAYJ3iNkr2rmIzVpETOu1jvSc0EsXRv2SM/piUrVKZR zUV5HkzKubG99RVCw13DeH00pBpUb1fptoPTBsjj5ugOebkMwGFFU4QUO8hu8wEJKMffOzKlk NffPIK7/wTQVAHJXsqzJ7428weakO4x5Y+FQMwMVywo/izUxPv8M7A5jIr64UVA27M7Kug8vC OnycRQP0gjcDChJrTZ1Kf9aMl+qfeMfXur7HZPa0mDOq5/aplIScAdUxnI74G1uXcyY7Jellb DW1dqBAmp8DfDG6GHmX48Z9Yhkqh5HvxXjAklmNqW1gvoX9AIwxE4cdy+KKEf2NMNmhi3Ozvi C+T0HxA71oq8oWcAE5SFI+chnhaBM2nA5k55yr/2XXhJ0Cfwe6ym2dHToIPEYoVPMJ7mO3028 Ch70c02+Vrh8ldOK7oCXsIlyeJBH6jHTji8uYidTVOtg31YL49NYoV/AXH8M+h7WACgQUHjzt 71llbgXb8BDe50eNZOpJ7ahtTZm1FLTwwHF/z5cVcvZbUuYvsBQv1vxhcX0hWSLnKotru+z6K Z5ORbqPLmwtTQgV5k2HzW6a6ja/4SDPnOXNBbjweLKZEVLf8ZN6QWevOXzlAfRznGBKi6KOY1 qXHV0oS1ifyjEjnSL7NbPo+nGT8M+1WsNOFGr7fjmz4l5L/WMi+KVRrPOz9OPJdtuW1nhrc71 N+iRFw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 63706 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 (-) Hi Saku, thanks for the patch. I tried updating telegram-desktop to 4.8.1 but it somehow never compiled. All patches do build and telegram runs fine. I could hopefully review them, add copyright lines for yourself and push them tomorrow if Liliana is not faster :) ~Jonathan
guix-patches@HIDDEN:bug#63706; Package guix-patches.
Full text available.
Received: (at 63706) by debbugs.gnu.org; 25 May 2023 19:12:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 25 15:12:51 2023
Received: from localhost ([127.0.0.1]:48162 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1q2GOJ-00043w-Hr
for submit <at> debbugs.gnu.org; Thu, 25 May 2023 15:12:51 -0400
Received: from vmi571514.contaboserver.net ([75.119.130.101]:34350
helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <saku@HIDDEN>) id 1q2GO6-00043A-NQ
for 63706 <at> debbugs.gnu.org; Thu, 25 May 2023 15:12:45 -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 4E0A0342F8A;
Thu, 25 May 2023 21:12:45 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
t=1685041965; bh=sn5yUImbTOU/O9on6EH2uaqHhLG9J7di+ZKIEwquA00=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=Inn1matwYcErbbaWRqBFIZSSi/xJ9PzkmvBqkRRxIPycSUQ0YtL2Oc+LX5fEHTDJ8
wYv8+u4LAEUWE48aw3OArAQOvSeAm/Jx6v+eZSfPIiiX3eV+4XWFlJ+OXQAArDrQ9a
YxTqJ/Mkav4/7t4Q7uZgWs6/r3C9Zcofc9iRnk+Y=
From: Saku Laesvuori <saku@HIDDEN>
To: 63706 <at> debbugs.gnu.org
Subject: [PATCH v3 2/3] gnu: Add glibmm-next
Date: Thu, 25 May 2023 22:12:03 +0300
Message-Id: <20230525191204.5866-2-saku@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230525191204.5866-1-saku@HIDDEN>
References: <749806feb4c74c2b6a8436ef678bfc34b40f2542.camel@HIDDEN>
<20230525191204.5866-1-saku@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63706
Cc: Saku Laesvuori <saku@HIDDEN>, liliana.prikler@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): 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..daf1902f26 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-next
+ (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)
--
2.39.2
guix-patches@HIDDEN:bug#63706; Package guix-patches.
Full text available.
Received: (at 63706) by debbugs.gnu.org; 25 May 2023 19:12:48 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 25 15:12:48 2023
Received: from localhost ([127.0.0.1]:48160 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1q2GOF-00043e-NN
for submit <at> debbugs.gnu.org; Thu, 25 May 2023 15:12:48 -0400
Received: from vmi571514.contaboserver.net ([75.119.130.101]:34336
helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <saku@HIDDEN>) id 1q2GO6-000439-NS
for 63706 <at> debbugs.gnu.org; Thu, 25 May 2023 15:12:42 -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 EAA7E340103;
Thu, 25 May 2023 21:12:44 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
t=1685041965; bh=MPjPnwLU92R/sqVy3wMFKOsuyUW7aHvCKDJNSnVm7Ko=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=cVFSvmpBwLfGGgNzo+IbPgKGap6V4GvfKtu3OGOjawRquJT2fWS/yo98ssBUMEPTi
6ErGPMdE9zD0vMbR4DYsmJgPXzzY1q0DqG9mQ1XtDKpVkQpCidbs88XHgSBOfjHqaI
ekUw+HvB4aDkYi07L5sN9uIDumrWKTQ5k34T+NCw=
From: Saku Laesvuori <saku@HIDDEN>
To: 63706 <at> debbugs.gnu.org
Subject: [PATCH v3 1/3] gnu: c++-gsl: Update to 4.0.0
Date: Thu, 25 May 2023 22:12:02 +0300
Message-Id: <20230525191204.5866-1-saku@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <749806feb4c74c2b6a8436ef678bfc34b40f2542.camel@HIDDEN>
References: <749806feb4c74c2b6a8436ef678bfc34b40f2542.camel@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63706
Cc: Saku Laesvuori <saku@HIDDEN>, liliana.prikler@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 (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
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 <guriev-ns@HIDDEN>
-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 <guriev-ns@HIDDEN>
-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 <gtest/gtest.h>
-+
-+#include <gsl/multi_span> // 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<int> 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<int> 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<int, 1> sav{av, {{4}, {}}};
- EXPECT_TRUE(sav[0] == 0);
base-commit: 3c33f7072a190231183f90a463a429dbb0d3e8b9
--
2.39.2
guix-patches@HIDDEN:bug#63706; Package guix-patches.
Full text available.
Received: (at 63706) by debbugs.gnu.org; 25 May 2023 19:12:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 25 15:12:47 2023
Received: from localhost ([127.0.0.1]:48158 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1q2GOC-00043U-An
for submit <at> debbugs.gnu.org; Thu, 25 May 2023 15:12:47 -0400
Received: from vmi571514.contaboserver.net ([75.119.130.101]:34352
helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <saku@HIDDEN>) id 1q2GO6-00043D-Nl
for 63706 <at> debbugs.gnu.org; Thu, 25 May 2023 15:12:42 -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 A499D342F8B;
Thu, 25 May 2023 21:12:45 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
t=1685041965; bh=N/7NeILkp+HN0Mbu86bnvejH/4oHg4761uVtTqOXyF8=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=GmxPjdZk5qVIMsh8o8FHB2+eRtU2XAigkNgZ2cJ/XFFkKPyuJCzyyEqFzq94qh51y
KvprvJOgX0pqV2dWuiLOH8Jr66FWd1NnycPaNWDX+um77USJhIDCGKThx1j0UiSjMV
VkgcFy+V0V0lAUpK0oCak4hO3V1QqdBkuGsmUfik=
From: Saku Laesvuori <saku@HIDDEN>
To: 63706 <at> debbugs.gnu.org
Subject: [PATCH v3 3/3] gnu: telegram-desktop: Update to 4.8.1
Date: Thu, 25 May 2023 22:12:04 +0300
Message-Id: <20230525191204.5866-3-saku@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230525191204.5866-1-saku@HIDDEN>
References: <749806feb4c74c2b6a8436ef678bfc34b40f2542.camel@HIDDEN>
<20230525191204.5866-1-saku@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63706
Cc: Saku Laesvuori <saku@HIDDEN>, liliana.prikler@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/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-next. 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]<phases>: 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-next.
* 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 <klemens@HIDDEN>
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<int64> CollectEndpointIds(
const QVector<MTPPhoneConnection> &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 <xiretza@HIDDEN>
-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 <cstdint>
-
- namespace rtc {
- class BitBuffer;
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index c6ab5d312c..ae286f4f98 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-next
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-next
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
--
2.39.2
guix-patches@HIDDEN:bug#63706; Package guix-patches.
Full text available.Received: (at 63706) by debbugs.gnu.org; 25 May 2023 18:38:13 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 25 14:38:13 2023 Received: from localhost ([127.0.0.1]:48126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1q2Fqm-0000Mm-Ri for submit <at> debbugs.gnu.org; Thu, 25 May 2023 14:38:13 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:50519) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>) id 1q2Fqk-0000MW-JK for 63706 <at> debbugs.gnu.org; Thu, 25 May 2023 14:38:11 -0400 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-96fe88cd2fcso178149866b.1 for <63706 <at> debbugs.gnu.org>; Thu, 25 May 2023 11:38:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685039884; x=1687631884; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=jU8kGz56ZDAphfWQPztjp0ZBYv0JUpmLKIj7j6rx42A=; b=XvNTbsxeGDZRufUcwwKGrCKetUTRne5iW/9AQ0V8thIkCaoHs/hmEsrcz/Rew24mV+ ektoEfYVywAq2Ggx+yn1lCdfvqOqlh2KgTJZbjXSGTqLFdHI7bOsXydBtEZ+2T5h2amo XgHMr3FCFis8A/eeQf3ay2sf2fqcjQMu1sZZAs02uoQ57W43sJ88kale60YkpT0E33rR BJBHB4BgUbHCHIcAg7OoK+VWGFbAvmfqT28FibnpvqtSd6OHaHB85HWAshWhzOq5mkvm bysjCNp22B5f9ETAmUiFTZ1pgC2e2PECEmRX/Sk8wH9m0ivlE4qlFbDMMo/NZMDi/fdD Q+AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685039884; x=1687631884; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=jU8kGz56ZDAphfWQPztjp0ZBYv0JUpmLKIj7j6rx42A=; b=cGZh2YQh0Z6oalMOhB6Vib0NvlXJXSghLPSG9hZvzrExLM454NgEgafmZhPw6R5ZAO mfg3QVnp9m/OyGyWCFHzg+dcNy4T6zIX50mYnoH1rzqXm5G1ihB3xFPHIVdPqP0ORqXS HET4xcUZfdk2Eilphb5vm9kKnTABPQp9wKVx92/dgDnf6ivFuyzcZ0gg13LBX0XvYllk 1EhZGIhB16loPabHKliarhpV01dW+Prkt5pel2KFxWIDbvWNsyctSrnPhU6jJxifDnTU 5kkhYeGY2YcVUl0RSu4vuLe0ERpAWKOlwy3F/s1AgSxqcRtiibNpfM60wMeFZaDmRemt 7J/Q== X-Gm-Message-State: AC+VfDy9iAIFoyI3iFcBrufkFjFuKwEJ8OYfrrLo0ETr4z5difc5+n5y owjYAC63Eo8M/S/YY1oEmPI= X-Google-Smtp-Source: ACHHUZ5NRXW7xhZg6WuMn5ixD627/QPaVFNkSJtBcvbw+cZI+e7f7QqXDG4RoSzolZ65m3JP2M5/Lw== X-Received: by 2002:a17:906:fe0e:b0:94a:35d1:59a with SMTP id wy14-20020a170906fe0e00b0094a35d1059amr1883503ejb.14.1685039884232; Thu, 25 May 2023 11:38:04 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id j4-20020a170906278400b00966056bd4f4sm1150446ejc.28.2023.05.25.11.38.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 11:38:03 -0700 (PDT) Message-ID: <749806feb4c74c2b6a8436ef678bfc34b40f2542.camel@HIDDEN> Subject: Re: [PATCH v2 2/3] gnu: Add glibmm-2.76 From: Liliana Marie Prikler <liliana.prikler@HIDDEN> To: Saku Laesvuori <saku@HIDDEN>, 63706 <at> debbugs.gnu.org Date: Thu, 25 May 2023 20:38:02 +0200 In-Reply-To: <20230525175443.10827-2-saku@HIDDEN> References: <7b5f5d605d53a90df35aae829c7ef34269fbc476.camel@HIDDEN> <20230525175443.10827-1-saku@HIDDEN> <20230525175443.10827-2-saku@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63706 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 (-) QW0gRG9ubmVyc3RhZywgZGVtIDI1LjA1LjIwMjMgdW0gMjA6NTQgKzAzMDAgc2NocmllYiBTYWt1 IExhZXN2dW9yaToKPiAqIGdudS9wYWNrYWdlcy9nbGliLnNjbSAoZ2xpYm1tLTIuNzYpOiBOZXcg dmFyaWFibGUuCj4gLS0tCj4gwqBnbnUvcGFja2FnZXMvZ2xpYi5zY20gfCAxNyArKysrKysrKysr KysrKysrKwo+IMKgMSBmaWxlIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKykKPiAKPiBkaWZmIC0t Z2l0IGEvZ251L3BhY2thZ2VzL2dsaWIuc2NtIGIvZ251L3BhY2thZ2VzL2dsaWIuc2NtCj4gaW5k ZXggMWYzZDNlZjYyOC4uYjUwZTI1MWI1YyAxMDA2NDQKPiAtLS0gYS9nbnUvcGFja2FnZXMvZ2xp Yi5zY20KPiArKysgYi9nbnUvcGFja2FnZXMvZ2xpYi5zY20KPiBAQCAtOTEzLDYgKzkxMywyMyBA QCAoZGVmaW5lIGdsaWJtbQo+IMKgdXNlZnVsIGZvciBDKysuIikKPiDCoMKgwqDCoCAobGljZW5z ZSBsaWNlbnNlOmxncGwyLjErKSkpCj4gwqAKPiArKGRlZmluZS1wdWJsaWMgZ2xpYm1tLTIuNzYK PiArwqAgKHBhY2thZ2UKPiArwqDCoCAoaW5oZXJpdCBnbGlibW0pCj4gK8KgwqAgKHZlcnNpb24g IjIuNzYuMCIpCj4gK8KgwqAgKG5hbWUgImdsaWJtbSIpCj4gK8KgwqAgKHNvdXJjZSAob3JpZ2lu Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKG1ldGhvZCB1cmwtZmV0Y2gpCj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKHVyaSAoc3RyaW5nLWFwcGVuZCAibWlycm9yOi8vZ25vbWUvc291cmNl cy9nbGlibW0vIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAodmVyc2lvbi1tYWpvcittaW5vciB2ZXJzaW9uKQo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCAiL2dsaWJtbS0iIHZlcnNpb24gIi50YXIueHoiKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCAoc2hhMjU2Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoYmFzZTMyCj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgCj4gIjFjaWE4dnJwd3puOHp3YWx3czQybWdhNWhpOTY1ODQwbTVz OGR2Znp2NTV4eDg2ZGhkdzYiKSkpKQo+ICvCoMKgIChwcm9wYWdhdGVkLWlucHV0cwo+ICvCoMKg wqAgKG1vZGlmeS1pbnB1dHMgKHBhY2thZ2UtcHJvcGFnYXRlZC1pbnB1dHMgZ2xpYm1tKQo+ICvC oMKgwqDCoMKgIChyZXBsYWNlICJnbGliIiBnbGliLW5leHQpKSkpKQo+ICsKPiDCoCAoZGVmaW5l LXB1YmxpYyBnbGlibW0tMi42NAo+IMKgwqDCoCAocGFja2FnZQo+IMKgwqDCoMKgIChpbmhlcml0 IGdsaWJtbSkKWW91IG1pZ2h0IHdhbnQgdG8gbWFrZSB0aGlzICJnbGlibW0tbmV4dCIgdG8ga2Vl cCB3aXRoIGdsaWItbmV4dC4gIFdlCnByb2JhYmx5IGFsc28gb3VnaHQgdG8gbWFrZSB0aGlzIHRo ZSBhY3R1YWwgZ2xpYm1tIG9uIHRoZSBnbm9tZS10ZWFtCmJyYW5jaC4KCkNoZWVycwo=
guix-patches@HIDDEN:bug#63706; Package guix-patches.
Full text available.
Received: (at 63706) by debbugs.gnu.org; 25 May 2023 17:54:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 25 13:54:56 2023
Received: from localhost ([127.0.0.1]:48043 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1q2FAt-00051P-Lr
for submit <at> 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 <saku@HIDDEN>) id 1q2FAq-00050w-Nn
for 63706 <at> 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=
From: Saku Laesvuori <saku@HIDDEN>
To: 63706 <at> debbugs.gnu.org
Subject: [PATCH v2 3/3] gnu: telegram-desktop: Update to 4.8.1
Date: Thu, 25 May 2023 20:54:43 +0300
Message-Id: <20230525175443.10827-3-saku@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230525175443.10827-1-saku@HIDDEN>
References: <7b5f5d605d53a90df35aae829c7ef34269fbc476.camel@HIDDEN>
<20230525175443.10827-1-saku@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63706
Cc: Saku Laesvuori <saku@HIDDEN>, liliana.prikler@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/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]<phases>: 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 <klemens@HIDDEN>
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<int64> CollectEndpointIds(
const QVector<MTPPhoneConnection> &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 <xiretza@HIDDEN>
-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 <cstdint>
-
- 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
--
2.39.2
guix-patches@HIDDEN:bug#63706; Package guix-patches.
Full text available.
Received: (at 63706) by debbugs.gnu.org; 25 May 2023 17:54:55 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 25 13:54:55 2023
Received: from localhost ([127.0.0.1]:48041 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1q2FAs-00051H-QY
for submit <at> 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 <saku@HIDDEN>) id 1q2FAq-00050u-6L
for 63706 <at> 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=
From: Saku Laesvuori <saku@HIDDEN>
To: 63706 <at> debbugs.gnu.org
Subject: [PATCH v2 1/3] gnu: c++-gsl: Update to 4.0.0
Date: Thu, 25 May 2023 20:54:41 +0300
Message-Id: <20230525175443.10827-1-saku@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <7b5f5d605d53a90df35aae829c7ef34269fbc476.camel@HIDDEN>
References: <7b5f5d605d53a90df35aae829c7ef34269fbc476.camel@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63706
Cc: Saku Laesvuori <saku@HIDDEN>, liliana.prikler@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 (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
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 <guriev-ns@HIDDEN>
-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 <guriev-ns@HIDDEN>
-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 <gtest/gtest.h>
-+
-+#include <gsl/multi_span> // 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<int> 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<int> 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<int, 1> sav{av, {{4}, {}}};
- EXPECT_TRUE(sav[0] == 0);
base-commit: 3c33f7072a190231183f90a463a429dbb0d3e8b9
--
2.39.2
guix-patches@HIDDEN:bug#63706; Package guix-patches.
Full text available.
Received: (at 63706) by debbugs.gnu.org; 25 May 2023 17:54:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 25 13:54:54 2023
Received: from localhost ([127.0.0.1]:48039 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1q2FAs-00051F-Gg
for submit <at> 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 <saku@HIDDEN>) id 1q2FAq-00050v-Fi
for 63706 <at> 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=
From: Saku Laesvuori <saku@HIDDEN>
To: 63706 <at> debbugs.gnu.org
Subject: [PATCH v2 2/3] gnu: Add glibmm-2.76
Date: Thu, 25 May 2023 20:54:42 +0300
Message-Id: <20230525175443.10827-2-saku@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230525175443.10827-1-saku@HIDDEN>
References: <7b5f5d605d53a90df35aae829c7ef34269fbc476.camel@HIDDEN>
<20230525175443.10827-1-saku@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63706
Cc: Saku Laesvuori <saku@HIDDEN>, liliana.prikler@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-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)
--
2.39.2
guix-patches@HIDDEN:bug#63706; Package guix-patches.
Full text available.Received: (at 63706) by debbugs.gnu.org; 25 May 2023 17:24:30 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 25 13:24:30 2023 Received: from localhost ([127.0.0.1]:47990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1q2EhS-00046x-5C for submit <at> debbugs.gnu.org; Thu, 25 May 2023 13:24:30 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:46552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>) id 1q2EhQ-00046k-FJ for 63706 <at> debbugs.gnu.org; Thu, 25 May 2023 13:24:29 -0400 Received: by mail-ed1-f68.google.com with SMTP id 4fb4d7f45d1cf-51144dddd4cso4085378a12.1 for <63706 <at> debbugs.gnu.org>; Thu, 25 May 2023 10:24:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685035462; x=1687627462; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=8/W0tEgNkW+H1DYCEGzEYgDONab8ECgp3NWdFx6WJZI=; b=cL1p+jjKsoumRxcHk+MMEqHqJGUeTNzAxy9jlSsCktcXgi36G9VcNr3tHsVvVksudc SVH+fHtYvVNJ6xX2F4z1SfP/iOE66e0sF2swtW+xJudY9sVRDBvJ1py4zTsPWb2CUTnK uHWrQQZLtCGqOaw1Avt6H9GGJhMZF6kD5UNPvFdAxbazelW3pTg38sm04EDgurpsBRPs wAnrsqDczSxAppnmPz7uuti2Od9KrHPuEJd55eVQEQMrrv/WP79yZW5yYJLJ6ZHrBKLY S/iIUoZTVy9aL5VpBnCv8vas5C/qNMLrYwHzZpdeXkKl5PDjbp1vR+ck6U3XbLELH3v5 zhhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685035462; x=1687627462; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=8/W0tEgNkW+H1DYCEGzEYgDONab8ECgp3NWdFx6WJZI=; b=bSdUZH7fENq83mSiNZRLxrZ2hIJ6oT6l8x0dpKyKFrpUP87Zo6KqzbxtD9TtaClAQ1 Q1Ab/2sS7y3fXAjaJ5M4or/PcPuTP8b/UUZG8e5UZx48nOWMgEpwBSEGHVhj8vWzOCRL ygV+3kG4qmcHjbhPxaxmRJ6ojfEYq72txEbkJbiVQ2sKZ2EDSg32mdXozLfXhdhlnWFn nQi2nvt1rUqxYfebjqpYnRqS6d2D+TnpuwKpSvgCF/doeWCsvo7fJS8r7TVnXuP8Zm2D tG9QYSZHeGSMoCALl95uPO7yHoNvSS518nmx8aAcgkkUX478u5+2B7wRjk/j7+aRvFrD w3aQ== X-Gm-Message-State: AC+VfDwWsZm2Ssvx5zUegj3x67zM99MNapjDl0doLYQcrKyae8mSM2WL iQS97XrfvI9V/WztvKwIZrU= X-Google-Smtp-Source: ACHHUZ7GRFHpGLWEwyTgElZq7cWAlOb1P23dtNugqxeqfkvTRPj5TNYDpbnCO8T4eoghYOmiN9QnZg== X-Received: by 2002:a17:907:7290:b0:96a:17f4:c9bb with SMTP id dt16-20020a170907729000b0096a17f4c9bbmr2313204ejc.58.1685035462135; Thu, 25 May 2023 10:24:22 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w9-20020a056402070900b0050bd59fd0efsm740372edx.49.2023.05.25.10.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 10:24:21 -0700 (PDT) Message-ID: <7b5f5d605d53a90df35aae829c7ef34269fbc476.camel@HIDDEN> Subject: Re: [PATCH] gnu: telegram-desktop: Update to 4.8.1 From: Liliana Marie Prikler <liliana.prikler@HIDDEN> To: Saku Laesvuori <saku@HIDDEN>, 63706 <at> debbugs.gnu.org Date: Thu, 25 May 2023 19:24:20 +0200 In-Reply-To: <20230524193141.26343-1-saku@HIDDEN> References: <20230524193141.26343-1-saku@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63706 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 (-) Am Mittwoch, dem 24.05.2023 um 22:31 +0300 schrieb Saku Laesvuori: > * 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/webrtc-for-telegram-desktop-fix-gcc12- > cstdint.patch: > =C2=A0 Delete file. > * gnu/packages/patches/c++-gsl-move-array-bounds-tests.patch: Delete > =C2=A0 file. > * gnu/local.mk (dist_patch_DATA): Remove deleted patches. > * gnu/packages/glib.scm (glibmm-2.76): New variable. > * gnu/packages/telegram.scm (libyuv-for-telegram-desktop, ChangeLog style has closing brackets at the end. > 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]<phases>: Add cld3 as a submodule. > [native-inputs]: Replace glib with glib-next > [inputs]: Add crc32c, kimageformats, plasma-wayland-protocols, > protobuf, > =C2=A0 qtdeclarative-5 and wayland-protocols. Replace glib with glib-next > and > =C2=A0 glibmm-2.64 with glibmm-2.76. > * gnu/packages/patches/telegram-desktop-allow-disable- > libtgvoip.patch: > =C2=A0 Update patch. > --- That's great and all, but please separate it into one patch per package. For the big update to telegram, you can do it together with the submodule bumps, but the rest ought to be separate. Cheers
guix-patches@HIDDEN:bug#63706; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 25 May 2023 09:55:13 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 25 05:55:13 2023 Received: from localhost ([127.0.0.1]:45999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1q27gf-000639-Ek for submit <at> debbugs.gnu.org; Thu, 25 May 2023 05:55:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:43388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <saku@HIDDEN>) id 1q27ga-00062y-UC for submit <at> debbugs.gnu.org; Thu, 25 May 2023 05:55:11 -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 <saku@HIDDEN>) id 1q27ga-00043d-Cp for guix-patches@HIDDEN; Thu, 25 May 2023 05:55:08 -0400 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 1q27gX-0001PL-Mp for guix-patches@HIDDEN; Thu, 25 May 2023 05:55:08 -0400 Received: from X-kone (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 8FFE4340147 for <guix-patches@HIDDEN>; Thu, 25 May 2023 11:55:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1685008510; bh=mof/GjBGuZqv/MjGmAo2MvLBGTKTzpl5A5Ax4ik3dVU=; h=Date:From:To:Subject:References:In-Reply-To; b=czPUlHGVmEV7KBNj7gHmRsVNo7F3jYMLr0DU6iwsgJ1JlXsfwAMyFk9LZyaM6S2mJ /ixAmoP/Whb1QDzxDzm+etoLyL4FrIXufq8VtmDX3s/krRZu7krw7VwMyb/OJCJHps v25hjpz8Go/VCX0HA/LoHkkF1+ArXM7JtZGH2E30= Date: Thu, 25 May 2023 12:55:01 +0300 From: Saku Laesvuori <saku@HIDDEN> To: guix-patches@HIDDEN Subject: Re: [PATCH] gnu: telegram-desktop: Update to 4.8.1 Message-ID: <20230525095501.govyvsenzibwwdge@X-kone> References: <20230524193141.26343-1-saku@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="lcab3vafqzkslb4y" Content-Disposition: inline In-Reply-To: <20230524193141.26343-1-saku@HIDDEN> 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: -1.4 (-) 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.4 (--) --lcab3vafqzkslb4y Content-Type: text/plain; charset=us-ascii Content-Disposition: inline I forgot to mention that this also fixes building telegram-desktop (at least on x86_64-linux) which was broken by the core-updates merge. --lcab3vafqzkslb4y Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoMkZR3NPB29fCOn/JX0oSiodOjIFAmRvMHUACgkQJX0oSiod OjKZZw//d4dM2JEqVDMpaU1YqBfAEZAioEMscTjj2DKW4y5v2jlo5fkMpW2o7ZRY 0JRfZdOiF3tA0iBizZdnwkHlchAMVzA95lHIkvH44Ji7CJ8feisuQfkeZq2PhvHj U3qvlfQnP3YElni/DkD/L27K1nM5phA67+cbKsmts9O40GWiqY7jygn40xDvsN/x lnpffQZNHiiKiiFkk6OEv8aVzEkPz20P3ACEVBjIrerpn6m6P+oonELDC6aojsYB YNyJIJhYX2YZe+J23rHc49JPo9MnjSPsq5uKh+0uXtLSY2HClPqkbiEiBeqwBo4I 14SNs5z1QXhU0l3/mbQRxSZBZaHEpwb8QWfxJ1wRNWURWwEx2kb8b1frVzYNxSab ZX9Yr8sosLBYP58OUD18dg3ltyx3n1OGX9oj/AW72SGu2GsE3buTbfcHfqZc8sw2 tUQOrqM9MmcCGChDRRzOL2UMJ1kt1Eu+c3PCSijpq49mvKT2DhNZg29MGybVV81G Eu3gR/a0xuoKa8MiOWE4wbchqo7QEkHw6ap5HcCfP2y7M82hlR5l/PXHZbV1BxqX mQUnsb+rr5WMFBOvuNIPFie3KaOyxDQy3Ejz0CYyXkz9422N6A/aRNiixRoswxai +BNf7grP/doXo2dtA1kGRVGkJ+D+rXsDOnSGj8RifvnaHohVqVM= =Ed/Z -----END PGP SIGNATURE----- --lcab3vafqzkslb4y--
guix-patches@HIDDEN:bug#63706; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 24 May 2023 19:32:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 24 15:32:04 2023
Received: from localhost ([127.0.0.1]:45185 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1q1uDL-0006cJ-75
for submit <at> debbugs.gnu.org; Wed, 24 May 2023 15:32:04 -0400
Received: from lists.gnu.org ([209.51.188.17]:35464)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <saku@HIDDEN>) id 1q1uDF-0006bp-JC
for submit <at> debbugs.gnu.org; Wed, 24 May 2023 15:32:01 -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 <saku@HIDDEN>) id 1q1uDF-0004GY-9J
for guix-patches@HIDDEN; Wed, 24 May 2023 15:31:57 -0400
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 1q1uDB-00041j-LZ
for guix-patches@HIDDEN; Wed, 24 May 2023 15:31:57 -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 8920E340121;
Wed, 24 May 2023 21:31:56 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
t=1684956716; bh=pzpHBU1yycPbgjUNhcmryqKktjD1AkkC3yZAkoVJ4+c=;
h=From:To:Cc:Subject:Date;
b=LcjL3Mjl+GjkR4TyUMFLQdoC1dOYTsdUWPwzRz6l6pS8KvCzsboUXIjsSRuANVRuV
akF+vJ+FiwoLWw9MIY5fruEuofpFSvQ51hpVtNpz5jFP/+r9KB+7jtRd/2PMJcWoYU
XP+ljZfGqtOyxThrmSWn5ltL9mcC9xkSz5DNjygc=
From: Saku Laesvuori <saku@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: telegram-desktop: Update to 4.8.1
Date: Wed, 24 May 2023 22:31:41 +0300
Message-Id: <20230524193141.26343-1-saku@HIDDEN>
X-Mailer: git-send-email 2.39.2
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: -1.4 (-)
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: -2.4 (--)
* 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/webrtc-for-telegram-desktop-fix-gcc12-cstdint.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/packages/glib.scm (glibmm-2.76): New variable.
* 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]<phases>: 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 | 3 -
gnu/packages/cpp.scm | 8 +-
gnu/packages/glib.scm | 17 +++
.../patches/c++-gsl-find-system-gtest.patch | 96 -------------
.../c++-gsl-move-array-bounds-tests.patch | 126 ------------------
...gram-desktop-allow-disable-libtgvoip.patch | 28 ++--
...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 ---
gnu/packages/telegram.scm | 103 ++++++++------
8 files changed, 93 insertions(+), 309 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
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 c10fb01bb3..4dc64e6d29 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 \
@@ -2047,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/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/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)
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 <guriev-ns@HIDDEN>
-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 <guriev-ns@HIDDEN>
-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 <gtest/gtest.h>
-+
-+#include <gsl/multi_span> // 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<int> 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<int> 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<int, 1> sav{av, {{4}, {}}};
- EXPECT_TRUE(sav[0] == 0);
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 <klemens@HIDDEN>
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<int64> CollectEndpointIds(
const QVector<MTPPhoneConnection> &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 <xiretza@HIDDEN>
-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 <cstdint>
-
- 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
base-commit: 3c33f7072a190231183f90a463a429dbb0d3e8b9
--
2.39.2
Saku Laesvuori <saku@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#63706; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.