From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id OBiVLqhY8mGgdwAAgWs5BA (envelope-from ) for ; Thu, 27 Jan 2022 09:32:40 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id iK95JqhY8mHEhAEAG6o9tA (envelope-from ) for ; Thu, 27 Jan 2022 09:32:40 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0D1FF287C1 for ; Thu, 27 Jan 2022 09:32:40 +0100 (CET) Received: from localhost ([::1]:44076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD0Ct-0004f8-0a for larch@yhetil.org; Thu, 27 Jan 2022 03:32:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCzcU-00037Y-LV for guix-patches@gnu.org; Thu, 27 Jan 2022 02:55:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33043) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nCzcU-0000Xv-B8 for guix-patches@gnu.org; Thu, 27 Jan 2022 02:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nCzcU-0006OJ-4d for guix-patches@gnu.org; Thu, 27 Jan 2022 02:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53387] [PATCH 0/4] Update tdlib and telega packages Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Jan 2022 07:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53387 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler , 53387@debbugs.gnu.org Cc: zevlg@yandex.ru, Nicolas Goaziou , avityazev@posteo.org Received: via spool by 53387-submit@debbugs.gnu.org id=B53387.164327007724533 (code B ref 53387); Thu, 27 Jan 2022 07:55:02 +0000 Received: (at 53387) by debbugs.gnu.org; 27 Jan 2022 07:54:37 +0000 Received: from localhost ([127.0.0.1]:54179 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCzc4-0006Nd-Mc for submit@debbugs.gnu.org; Thu, 27 Jan 2022 02:54:37 -0500 Received: from mail-lj1-f174.google.com ([209.85.208.174]:46817) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCzc0-0006NN-Ko for 53387@debbugs.gnu.org; Thu, 27 Jan 2022 02:54:35 -0500 Received: by mail-lj1-f174.google.com with SMTP id c7so2527745ljr.13 for <53387@debbugs.gnu.org>; Wed, 26 Jan 2022 23:54:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop-in.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=K0W9YNdBfYGwhYmlCuvhw8UXlGBXqLfXO9xutKGTWKA=; b=IONvJrTM7kQKCavmDQvIs6MXCSlFg7Ei0HdrkVb7ohPIDQMjJKPcOvayrxweWkB6Mg u3qWcmcvjJchMG7yFzc1ae7DLxSo0vJimR8cLw11Fq1DG3r4vIdUERPM0Chl/hWuukSh xxYHd9XKEI/BDB9aK2xHch9WqiPKuq8rVyG9u6TmFUEElUH8NwB/PeAzYs0WiAaLl/rx B6lc0KF1CXvTo1Dd8h7Jv0NHKO6qJh8Goi9YDVSupF79fRxwRtV3qfLpipCUpA2FiSqx 1jw/mkkNTCy6+geFdzjbHpGTKD+DkZiacJft3XFncau6PEeK5Hzz/OBkEpD6OteKMPf4 4emw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=K0W9YNdBfYGwhYmlCuvhw8UXlGBXqLfXO9xutKGTWKA=; b=yw14qZxRSt0pq26/7LjT92Eiw53r1JbUCQGZVxk4Q7oIzdesiGhIAUhgNBhozHFJi3 Kt6pYNAiHLHYhlVQTAun6WlzwgYkLEfZJvcMnptXLNqfLgGQmUXdhNDwJR1UYWLPsEyA qsXVL7QuNPZbqohMtroC5FMfADVd2Nn/yQ73ygXxovrnOlYHFwShus69MZSWKxY9/zCy SEcy7D67umYha0d4wCUZxJuJlHYvQlq+4bxm1h5+184YiSd/RDZ4A1Tf5CATgo4IGmoX n/PqkYxS3ccJrpT7+ZEWV0gOtErxadsGTDjP+0dNZpjB5wKX9didD6gImLNHy3FY7F0+ ZYkA== X-Gm-Message-State: AOAM531FxXJ6XYJAC5wVqYSTuqPEGjcSgeADChOTjSXwOLSzU76MiCZj 9I4aLpyPa2WFMe/t6mU1CesQnA== X-Google-Smtp-Source: ABdhPJxxDFwqTnwsZikwgMkQ52U1NvmMq55+1vvGLVTHrTzmg9tgrokmTX19ycxU4geAmkcNZXNQ+Q== X-Received: by 2002:a2e:a812:: with SMTP id l18mr2078349ljq.110.1643270066468; Wed, 26 Jan 2022 23:54:26 -0800 (PST) Received: from localhost (109-252-135-33.dynamic.spd-mgts.ru. [109.252.135.33]) by smtp.gmail.com with ESMTPSA id d26sm2078250lfb.177.2022.01.26.23.54.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jan 2022 23:54:22 -0800 (PST) From: Andrew Tropin In-Reply-To: References: <87tudyipzg.fsf@trop.in> Date: Thu, 27 Jan 2022 10:54:14 +0300 Message-ID: <87ee4tsjfd.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1643272360; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=K0W9YNdBfYGwhYmlCuvhw8UXlGBXqLfXO9xutKGTWKA=; b=Lhd/4gQAbmiT1EdaI0BqHXCl0pXs6lylEt3FTVSsNpdhyOUF1MEk9yu2OllzMzszo+ryNu 5dYrFY/9bfaxDmGqPyyOJeLMSmG7WBnWV3oj3JFkUXacnq7nKv78a5t25pVlTox3btFvKl o1/iZCEoFduPJUvY559vqF4xDgqGCr5Ezs67QHa7Njq4ViG6g33j+Cxo2lh+c4b6/xxU8f Dks6ql2/82c+TrlVTA9jsCezMkJuUsX+3MBFNKOX7gNY+tNrttuiNf+3ruA7ouP1MOECne 4ssSVbX5FJjo7AzsQywMdinS0rI2VEblEyXYjibRX/MU+uQFaZn1DLYxB0MBvQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1643272360; a=rsa-sha256; cv=none; b=MpSoDx9jqfLzF0RnrEuyTxL3wPq5BMVIS79TEWbplFMP8XZlg7cRRU+sA7BQyTdUkqs8c8 pR7fGQRlTlrO0tPla+E2yrGkteSs5pd/5N7FLyiZA7rVMMLGMbEA7Joq4zp5I30xXQp711 p+2R24//12L2BFex0YRtO/OVE8HTEE5ctg2HvFhbN9ILRTD/oiiHxa7ML6FCKosg/npXz5 I/kPP4kymVKs0rxJZ2UOJW+K46iy/vZ3BBlishuA+9Y6nkptya6WHb3mOQ/UqAKv35XZSG YKaPmOks2PYnVoCVn6qrRWz83T9Bf+i6eQrAH8eSYRjMGBgfPDrqc6hbpSOoBQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop-in.20210112.gappssmtp.com header.s=20210112 header.b=IONvJrTM; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.53 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop-in.20210112.gappssmtp.com header.s=20210112 header.b=IONvJrTM; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 0D1FF287C1 X-Spam-Score: -3.53 X-Migadu-Scanner: scn0.migadu.com X-TUID: 7vLpPGRZLL7Y --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable CCed: avityazev, zevlg On 2022-01-22 16:14, Liliana Marie Prikler wrote: > Hi Andrew,=20 > > Am Donnerstag, dem 20.01.2022 um 14:45 +0300 schrieb Andrew Tropin: >> tdlib and telega are inteded to be used from specific commits not >> tags, I keep revision and commit parameters for those packages to >> make it easier to update them to untagged commits in the future. >>=20 >> https://github.com/tdlib/td/issues/1790 >>=20 >> Also, updated the style for arguments. > It appears Telega was already updated through a different patch. The > style adjustments are still relevant, but fail to apply currently. > Updated patches. >=20 > As for commit vs. tag, I've CC'd Nicolas to make a more informed > decision. I do understand your reasoning, but OTOH I disagree with > Telegram's "every commit is as good as a release" stance, particularly > if there's a widely used client whose releases fail in CI :) I agree, tdlib rolling release seems a little strange to me and I personally not in a favor of it. I still propose to keep commit and revision variables for both tdlib and telega to be able to update them from time to time to a fresh version, which surely won't have a release tag. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-telega-Use-new-package-style.patch Content-Transfer-Encoding: quoted-printable From=2078e24c360cbd9c9cd791f56aeb290fffbc29ebae Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 20 Jan 2022 14:09:14 +0300 Subject: [PATCH 1/2] gnu: telega: Use new package style. * gnu/packages/emacs-xyz.scm (emacs-telega, emacs-telega-contrib): Use gexp= s, remove trailing #t. =2D-- gnu/packages/emacs-xyz.scm | 82 +++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 387f1b93fd..d456a6cd52 100644 =2D-- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27030,39 +27030,40 @@ (define-public emacs-telega (name "emacs-telega") (build-system emacs-build-system) (arguments =2D `(#:emacs ,(if (target-64bit?) =2D emacs-minimal =2D ;; Require wide-int support for 32-bit platform. =2D emacs-wide-int) =2D #:include (cons "^etc\\/" %default-include) =2D #:phases =2D (modify-phases %standard-phases =2D (add-after 'unpack 'patch-sources =2D (lambda* (#:key inputs #:allow-other-keys) =2D ;; Hard-code paths to `ffplay` and `ffmpeg`. =2D (let* ((ffplay-bin (search-input-file inputs "/bin/ffplay")) =2D (ffmpeg-bin (search-input-file inputs "/bin/ffmpeg")= )) =2D (substitute* '("telega-ffplay.el" "telega-vvnote.el") =2D (("(shell-command-to-string\|concat) \"(ffmpeg\|ffprobe= )" =2D all func cmd) =2D (string-append func " \"" =2D (search-input-file =2D inputs (string-append "/bin/" cmd)))) =2D (("\\(executable-find \"ffplay\"\\)") =2D (string-append "(and (file-executable-p \"" ffplay-bin= "\")" =2D "\"" ffplay-bin "\")")) =2D (("\\(executable-find \"ffmpeg\"\\)") =2D (string-append "(and (file-executable-p \"" ffmpeg-bin= "\")" =2D "\"" ffmpeg-bin "\")")))))) =2D (add-after 'unpack 'configure =2D (lambda* (#:key inputs outputs #:allow-other-keys) =2D (substitute* "telega-customize.el" =2D (("@TELEGA_SERVER_BIN@") =2D (search-input-file inputs "/bin/telega-server"))) =2D (substitute* "telega-util.el" =2D (("@TELEGA_SHARE@") =2D (string-append (elpa-directory (assoc-ref outputs "out")) =2D "/etc")))))))) + (list + #:emacs (if (target-64bit?) + emacs-minimal + ;; Require wide-int support for 32-bit platform. + emacs-wide-int) + #:include #~(cons "^etc\\/" %default-include) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda* (#:key inputs #:allow-other-keys) + ;; Hard-code paths to `ffplay` and `ffmpeg`. + (let* ((ffplay-bin (search-input-file inputs "/bin/ffplay")) + (ffmpeg-bin (search-input-file inputs "/bin/ffmpeg"))) + (substitute* '("telega-ffplay.el" "telega-vvnote.el") + (("(shell-command-to-string\|concat) \"(ffmpeg\|ffprobe)" + all func cmd) + (string-append func " \"" + (search-input-file + inputs (string-append "/bin/" cmd)))) + (("\\(executable-find \"ffplay\"\\)") + (string-append "(and (file-executable-p \"" ffplay-bin = "\")" + "\"" ffplay-bin "\")")) + (("\\(executable-find \"ffmpeg\"\\)") + (string-append "(and (file-executable-p \"" ffmpeg-bin = "\")" + "\"" ffmpeg-bin "\")")))))) + (add-after 'unpack 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "telega-customize.el" + (("@TELEGA_SERVER_BIN@") + (search-input-file inputs "/bin/telega-server"))) + (substitute* "telega-util.el" + (("@TELEGA_SHARE@") + (string-append (elpa-directory (assoc-ref outputs "out")) + "/etc")))))))) (inputs (list emacs-telega-server ffmpeg)) (native-inputs '()) @@ -27078,13 +27079,14 @@ (define-public emacs-telega-contrib (inherit emacs-telega) (name "emacs-telega-contrib") (arguments =2D `(#:exclude '("telega-live-location.el") =2D #:phases =2D (modify-phases %standard-phases =2D (add-after 'unpack 'enter-subdirectory =2D (lambda _ (chdir "contrib") #t)) =2D (add-before 'install-license-files 'leave-subdirectory =2D (lambda _ (chdir "..") #t))))) + (list + #:exclude '("telega-live-location.el") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'enter-subdirectory + (lambda _ (chdir "contrib"))) + (add-before 'install-license-files 'leave-subdirectory + (lambda _ (chdir "..")))))) (inputs '()) (native-inputs '()) (propagated-inputs =2D-=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-tdlib-Use-new-package-style.patch Content-Transfer-Encoding: quoted-printable From=2090a77ee77aa4f339c9cee978e96ee72e1316bcd9 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 20 Jan 2022 13:27:15 +0300 Subject: [PATCH 2/2] gnu: tdlib: Use new package style. * gnu/packages/messaging.scm (tdlib): Use gexps, remove trailing #t. =2D-- gnu/packages/messaging.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 768642f119..01316f8bd2 100644 =2D-- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2612,20 +2612,21 @@ (define-public tdlib (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments =2D `(#:tests? #t =2D #:configure-flags =2D (list "-DCMAKE_BUILD_TYPE=3DRelease" =2D "-DTD_ENABLE_LTO=3DOFF") ; FIXME: Get LTO to work. =2D #:phases =2D (modify-phases %standard-phases =2D (add-after 'unpack 'remove-failing-tests =2D (lambda _ =2D (substitute* "test/CMakeLists.txt" =2D ;; The test cases are compiled into a distinct binary =2D ;; which uses mtproto.cpp to attempt to connect to =2D ;; a remote server. Removing this file from the sources =2D ;; list disables those specific test cases. =2D (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/mtproto.cpp") ""))))= ))) + (list + #:tests? #t + #:configure-flags + #~(list "-DCMAKE_BUILD_TYPE=3DRelease" + "-DTD_ENABLE_LTO=3DOFF") ; FIXME: Get LTO to work. + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-tests + (lambda _ + (substitute* "test/CMakeLists.txt" + ;; The test cases are compiled into a distinct binary + ;; which uses mtproto.cpp to attempt to connect to + ;; a remote server. Removing this file from the sources + ;; list disables those specific test cases. + (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/mtproto.cpp") "")))))= )) (native-inputs (list gperf openssl zlib php doxygen)) (synopsis "Cross-platform library for building Telegram clients") =2D-=20 2.34.0 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D-=20 Best regards, Andrew Tropin --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJDBAEBCgAtFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmHyT6YPHGFuZHJld0B0 cm9wLmluAAoJECII0glYwd6wovYP/1sM9pTpRvgOn/tkIZJK88lfJadDDcMUlda+ KXIOHEUsH5yOr2GU+QW3ii4T57RiVRMIBuXOtk92OX1PmhMrKjFl9PElNOpw8gwb Xhvq0LPc6gXg2FU//mkXWeN/fG0EF9zDpUO0chfbLbZNZDzAPejSMvbzcRVSO67c 0ZJkDRNG0uUYGOb4eLCMwWA/pZTR8M0/VgznfreaXhUqoGhXc5HOCmFVjIBrhN5N tcaGZ1JZD8B9Z5qXLNVSwA119HFSkw24MAK74Fld6AD5OR4OTUEqMIIipWILf9RF ulsYTIrRXPp18B1kaqNOQ9O603aEJffM7vKjjvS+cLq9Ajs1iHuz/5ZNiF9bkkJp d12i/sUCWvUidQ8WMis4FpkkdrqKtq0uxWX8PQW8Ywnco4dZt6pYaC+QWLvcZEr2 /WfVt87Oi+T0Yd6Tb+m2evKaWwQN2FAtcFMXKs1eL5VI+IeFawToxP/GQlhceKei 3E1/oMMSki2XXum1VFX1xbQ8l22RCihEpWXOp1Xf1Lmttt8dFx977s9CDnLsEF5i u1XPY8i1ovFsGnFp9YKGonkvnam6KFjDKeAyi7Jv7EVrtD5y8NuKQM60IuWnPCyz XqMknX4iPthIY3B6Y4YPnR/rx1O2vFDI7s58QGiKdcV+R6lZTyX9xji5du9kTced OVojp/5C =YGRn -----END PGP SIGNATURE----- --==-=-=--