From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id UBVFI7wcNmEDXQAAgWs5BA (envelope-from ) for ; Mon, 06 Sep 2021 15:50:52 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id iCnpHrwcNmEJOwAAB5/wlQ (envelope-from ) for ; Mon, 06 Sep 2021 13:50:52 +0000 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 3499FEC6E for ; Mon, 6 Sep 2021 15:50:52 +0200 (CEST) Received: from localhost ([::1]:35638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNF1P-0006Qc-3f for larch@yhetil.org; Mon, 06 Sep 2021 09:50:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNEtr-0004Rx-35 for guix-patches@gnu.org; Mon, 06 Sep 2021 09:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40895) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNEtq-0000R6-S5 for guix-patches@gnu.org; Mon, 06 Sep 2021 09:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNEtq-0003fY-MP for guix-patches@gnu.org; Mon, 06 Sep 2021 09:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50429] [PATCH] gnu: update emacs-telega-server and some change Resent-From: Zheng Junjie <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Sep 2021 13:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50429 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50429@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163093573814048 (code B ref -1); Mon, 06 Sep 2021 13:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Sep 2021 13:42:18 +0000 Received: from localhost ([127.0.0.1]:52441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNEt7-0003eW-Id for submit@debbugs.gnu.org; Mon, 06 Sep 2021 09:42:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:51044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1mNEt4-0003eJ-9k for submit@debbugs.gnu.org; Mon, 06 Sep 2021 09:42:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1mNEt2-0003ZO-Pe for guix-patches@gnu.org; Mon, 06 Sep 2021 09:42:14 -0400 Received: from out203-205-221-191.mail.qq.com ([203.205.221.191]:46959) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1mNEsv-0007qm-0U for guix-patches@gnu.org; Mon, 06 Sep 2021 09:42:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1630935713; bh=A9txqk/BP1RYw3CofqWAy9Ph2T0dNiNskUjqcFW1ldo=; h=From:To:Subject:Date; b=OLl7JuiEwiov9lWcx+/YaivhaAwFEwxxQRYeb4ETy+J3emNMeki9YRC/t/SvOKAHz SQOb0AuhM793xg4Ru1l90ryP+IrFv/8cLL64wYqISbvYMe/jBp9BG4KQ+LoAk4g/x/ ud1Z1vET7vVxuMQhrKzbbw19tN1NXDNsr3OzgemI= Received: from asus ([2409:8928:e20:956f:3656:122b:2c19:2164]) by newxmesmtplogicsvrsza28.qq.com (NewEsmtp) with SMTP id 69699C54; Mon, 06 Sep 2021 21:26:22 +0800 X-QQ-mid: xmsmtpt1630934782tfdq1km71 Message-ID: X-QQ-XMAILINFO: MGhbRXrJQDkwu0FUUope2JH/GXmvviKpb4uroS0A9Rt+jXS1K7ktEO+KAVG5Xk U8e+wPOHbz/lvG0nr0XOItntwmFjMEKfKqTsnlBdgZanUM0pHABP/G0JTyN9xMqP80LjbcENqt2J nLHNUCqIAxV8Z+GsLf8+33Zga8ra3RIC3nS4C6/CcJ2SVUS/o8wnEvEMheJv9Vz1FhBG29cIsuvZ 2d/VHi19llukFHFKpJ2qX+ivwlpAqPNJK4K7xGC2G502zoH9SzgF72RZaXWWXimDktRrmiRERa61 1n7e71OiqYW/ypyCgocfWOAvMo6JEfWXl6OdiEEzt5tYKLmecGLwSpFiBN2psDhMh/kGb7qQja+p pIKBMh3/81vLy3ALTvrcwXbLSLaMHxDognkkexS/mkPvCApEvjzqkbtGTprBeH2gs1OyVOx0Upyf mPnG5b1Ah/TqR1rlf13jamPkEYgiH67zU8q0THCIWBHu8gbExk0PsABFtwrr/MzrVemB0GRsLK+Z nCy2beY1pknlf7ib6yWUgY/xGWxqUrclnj4oyWCbfrQz1Hf7v5PPdNHAjGQKzWTnMyxyBBrGCpsh 4iwUQUJVQETFxrrPT1NHQVJ+C55zG6kzXwbnnzKxnuZG37iuxQZSNY3yoLxwKVe0JQFcJ739uk26 p6uAR8TwE2H0lENXTBkTyS6dLPY6bMWgLYiXvzSfHppQPMzv+oXEO3HauCbaJbKJ+YC1xoyOHkTL 0v3oWK34JfW9xmN5I6khV5FFJ96C5ERtex4PTa2FCN7DTrleGO2eBN5DPgqQY8mWrE0Q3NmeHrPE vXhQ6M6N3ZEZ4KKr5wQk+YKvIjjMc112S8cbc2ZMBXzg== User-agent: mu4e 1.6.5; emacs 28.0.50 Date: Mon, 06 Sep 2021 21:25:15 +0800 Message-ID: <87a6kpkf7l.fsf@qq.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=203.205.221.191; envelope-from=873216071@qq.com; helo=out203-205-221-191.mail.qq.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, HELO_DYNAMIC_IPADDR=1.951, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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" Reply-to: Zheng Junjie <873216071@qq.com> X-ACL-Warn: , Zheng Junjie via Guix-patches From: Zheng Junjie via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1630936252; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=A9txqk/BP1RYw3CofqWAy9Ph2T0dNiNskUjqcFW1ldo=; b=Myo3LizpD3j0wirbMT3Sv8gQitmav5HYTHDFzpgmgrHdJVEHoJooIXU1chMJIFp+BzMXZx Ku0JVxuHZB9oMzCNEiXQ0lNpohvK5dRM7bHWsWo7jtNpc/LtUlHZ/7KePRpDs6x1EuA02f HTY18nmeD9JaLjmX5iNWlUmcrvsPTuPkI5ga8IGnDIwJVes0ggzHDn8J+BCxkVP4Gfz28w b1hBVgKkvDPIbgrM+EdxFOThXF6aud5VzbajKRrRPc3m75xnPP5diPnlcwvj26smkFmzeh V+sP7j01MIR1K7r91jGy+d5pCstpCpfHNn1iIkQC4qTTU0NmGnqx9V0x/n9RLA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630936252; a=rsa-sha256; cv=none; b=XfKtivgtY5lwkhKYq8Rt2rCXapv+1UPsCFYggKmdpQ9Lqsv5FWgcOavCkm95KUlZgUbVBS uL7qv79P3BptXL+P0/RdLE2CPxH8xYxD0Ut6lJ7FlbOUCyZ75k7r2JanroJQ/jyAzbI0aK 6GJiMzbZzmEhO1W2uL4Ar/sCJRv45/1q97APNo6KmilL3f8kB4t+P0xtxgQhPicJcV6BkC Z0FMvsKRjoKEwosV95ik65zPSJWD/mK0LpGyKeqDqOpQ4YaNOtfvXVIh6oTZORuuIANtEV ucENBPeQXDEQFWvXz5r98vEg5nsYYpQwDpJymFyRao9xeblmmdlSpEvzJqkN7w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=OLl7JuiE; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 1.98 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=OLl7JuiE; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 3499FEC6E X-Spam-Score: 1.98 X-Migadu-Scanner: scn0.migadu.com X-TUID: cqKU+LDwZOpt --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-emacs-telega-server-Update-to-0.7.030.patch >From 92a450fe602c1f0d5ff244762239240d6b72749f Mon Sep 17 00:00:00 2001 From: Z572 <873216071@qq.com> Date: Mon, 6 Sep 2021 18:43:56 +0800 Subject: [PATCH 1/3] gnu: emacs-telega-server: Update to 0.7.030. * gnu/packages/emacs-xyz.scm (emacs-telega-server): Update to 0.7.030. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f04a0225b3..e682d9cdd2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26599,7 +26599,7 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (define-public emacs-telega-server (package (name "emacs-telega-server") - (version "0.7.025") + (version "0.7.030") (source (origin (method git-fetch) @@ -26607,7 +26607,7 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (url "https://github.com/zevlg/telega.el") (commit (string-append "v" version)))) (sha256 - (base32 "1fdvghwpmja94d65p02j7wa09lwjs3ah1kfb1v17b6l9qd5g80nc")) + (base32 "1g29v5fgkqx43wsvh1npx0g3hj00n37lxgvxjvy85fs4h9226gl9")) (file-name (git-file-name "emacs-telega" version)) (patches (search-patches "emacs-telega-path-placeholder.patch" -- 2.33.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-emacs-telega-server-use-make-flags-instead-of-mo.patch >From c0ea703079ea9e209c07b0c67d4f2818cd6d94fd Mon Sep 17 00:00:00 2001 From: Z572 <873216071@qq.com> Date: Mon, 6 Sep 2021 18:44:38 +0800 Subject: [PATCH 2/3] gnu: emacs-telega-server: use make-flags instead of modify makefile. * gnu/packages/emacs-xyz.scm (emacs-telega-server)[arguments]: Add the #:make-flags argument. and remove substitute* makefile. --- gnu/packages/emacs-xyz.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e682d9cdd2..081e8cceab 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26614,18 +26614,17 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") "emacs-telega-test-env.patch")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "INSTALL_PREFIX=" + (assoc-ref %outputs "out") "/bin")) + #:phases (modify-phases %standard-phases (add-before 'configure 'enter-subdirectory (lambda _ (chdir "server") #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("CC=cc") ,(string-append "CC=" (cc-for-target))) - (("^(INSTALL_PREFIX=).*$" _all prefix) - (string-append prefix out "/bin\n"))) - (substitute* "run_tests.py" (("^(TELEGA_SERVER = ).*$" _all prefix) (string-append prefix -- 2.33.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-gnu-emacs-telega-Install-etc-directory-to-better-pat.patch >From 51806ebddc0cc85a84017ed6537eee6ed6238760 Mon Sep 17 00:00:00 2001 From: Z572 <873216071@qq.com> Date: Mon, 6 Sep 2021 18:56:18 +0800 Subject: [PATCH 3/3] gnu: emacs-telega: Install etc directory to better path. * gnu/packages/emacs-xyz.scm (emacs-telega)[arguments]: Add the #:include argument. Remove install-share-files phase. --- gnu/packages/emacs-xyz.scm | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 081e8cceab..2f5a0d46ee 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26657,6 +26657,7 @@ service, and connect it with Emacs via inter-process communication.") 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 @@ -26684,24 +26685,8 @@ service, and connect it with Emacs via inter-process communication.") "/bin/telega-server"))) (substitute* "telega-util.el" (("@TELEGA_SHARE@") - (string-append (assoc-ref outputs "out") - "/share/emacs-telega"))))) - (add-after 'install 'install-share-files - (lambda* (#:key outputs #:allow-other-keys) - (define install-plan - '("langs" "sounds" "emojis.alist" - "verified.svg" "telega-logo.svg")) - - (define prefix (string-append (assoc-ref outputs "out") - "/share/emacs-telega")) - (with-directory-excursion "etc" - (for-each (lambda (file) - (if (file-is-directory? file) - (let ((dest (string-append prefix "/" file))) - (copy-recursively file dest)) - (install-file file prefix))) - install-plan)) - #t))))) + (string-append (elpa-directory (assoc-ref outputs "out")) + "/etc")))))))) (inputs `(("emacs-telega-server" ,emacs-telega-server) ("ffmpeg" ,ffmpeg))) -- 2.33.0 --=-=-= Content-Type: text/plain -- over --=-=-=--