From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Joseph Turner via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements Date: Sat, 06 May 2023 13:54:49 -0700 Message-ID: <87fs89qg9y.fsf@breatheoutbreathe.in> Reply-To: Joseph Turner Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="21926"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Philip Kaludercic To: 63337@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat May 06 23:53:27 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pvPqH-0005VB-93 for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 06 May 2023 23:53:25 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvPpw-0007H0-A6; Sat, 06 May 2023 17:53:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvPpu-0007Go-Na for bug-gnu-emacs@gnu.org; Sat, 06 May 2023 17:53:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pvPpu-0004lN-Ej for bug-gnu-emacs@gnu.org; Sat, 06 May 2023 17:53:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pvPpu-0000tD-2B; Sat, 06 May 2023 17:53:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Joseph Turner Original-Sender: "Debbugs-submit" Resent-CC: philipk@posteo.net, bug-gnu-emacs@gnu.org Resent-Date: Sat, 06 May 2023 21:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63337 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org X-Debbugs-Original-Xcc: Philip Kaludercic Original-Received: via spool by submit@debbugs.gnu.org id=B.16834099583388 (code B ref -1); Sat, 06 May 2023 21:53:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 6 May 2023 21:52:38 +0000 Original-Received: from localhost ([127.0.0.1]:35907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvPpW-0000sZ-6e for submit@debbugs.gnu.org; Sat, 06 May 2023 17:52:38 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:39280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvPpT-0000sN-Gh for submit@debbugs.gnu.org; Sat, 06 May 2023 17:52:36 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvPpT-0007DF-B1 for bug-gnu-emacs@gnu.org; Sat, 06 May 2023 17:52:35 -0400 Original-Received: from out-15.mta1.migadu.com ([2001:41d0:203:375::f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvPpQ-0004i2-Ik for bug-gnu-emacs@gnu.org; Sat, 06 May 2023 17:52:35 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=breatheoutbreathe.in; s=key1; t=1683409948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=fu6G2H3X9xwc5BwGgWIYi40djzBP4kjA+aGoPWsqOi8=; b=mWirboyxnp9tgzPrlu8f4E8BTFPaLxeaDTzBKXpGeh4JWll/JiA0u2lVmJkKbAXWUWjPx4 h3QZ19cy7SMKns0scdNa5ef34Xk7aMA462zkZsWh472m7EaENs1+emMbbYzwixPiDGLgN7 f86B5xcx/KL/1S+mcFQtZJ6nSikDJ0A= X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=2001:41d0:203:375::f; envelope-from=joseph@breatheoutbreathe.in; helo=out-15.mta1.migadu.com 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_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:261221 Archived-At: --=-=-= Content-Type: text/plain Hello! Because package-vc--build-documentation exports the texinfo manual to a temp file inside /tmp/ , any @include statements with relative paths break the makeinfo call. I noticed this issue when attempting to use package-vc to install org-transclusion, whose manual contains the line #+texinfo: @include fdl.texi See: https://raw.githubusercontent.com/nobiot/org-transclusion/main/docs/org-transclusion-manual.org The attached patch solves this problem by passing the -I flag to makeinfo. From makeinfo --help: -I DIR append DIR to the @include search path. Best, Joseph --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Fix-package-vc-build-documentation-Relative-include-.patch >From a41abce88ed3b833c5531208945474c9cd16284b Mon Sep 17 00:00:00 2001 From: Joseph Turner Date: Sat, 6 May 2023 14:49:43 -0700 Subject: [PATCH] Fix: (package-vc--build-documentation) Relative @include statements --- lisp/emacs-lisp/package-vc.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index 489610e2a1e..63c10285ca7 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -381,6 +381,7 @@ FILE can be an Org file, indicated by its \".org\" extension, otherwise it's assumed to be an Info file." (let* ((pkg-name (package-desc-name pkg-desc)) (default-directory (package-desc-dir pkg-desc)) + (docs-directory (expand-file-name (file-name-directory file))) (output (expand-file-name (format "%s.info" pkg-name))) clean-up) (when (string-match-p "\\.org\\'" file) @@ -395,7 +396,9 @@ otherwise it's assumed to be an Info file." (erase-buffer) (cond ((/= 0 (call-process "makeinfo" nil t nil - "--no-split" file "-o" output)) + "-I" docs-directory + "--no-split" file + "-o" output)) (message "Failed to build manual %s, see buffer %S" file (buffer-name))) ((/= 0 (call-process "install-info" nil t nil -- 2.39.2 --=-=-=--