Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Texinfo 7 update #1203

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Texinfo 7 update #1203

wants to merge 3 commits into from

Conversation

nieder
Copy link
Member

@nieder nieder commented Dec 30, 2024

Update from our oldish 6.8 to latest 7.2
Mostly minor changes. The current texinfo.patch includes patches that are then applied (they seem to have been inherited from Debian). I took those patches out of texinfo.patch into individual patch files to make tracking easier.

I don't know about the need to keep carrying texinfo-dont_build_info.patch. It was added back in e4e4ffc (2016) in our texinfo-6.3 days. Debian removed that patch with texinfo-6.7 at debian-tex/texinfo@ded8ba0 when the docs became DFSG approved. I've kept the spirit of the patch as is (updated for current code), but I think we are basically applying it then @akhansen modified it to basically reverse it in 7b916c0 .

There's also a fix to allow jpg files in share/info as per #1178

@nieder nieder added the new upstream Package has an updated upstream version label Dec 30, 2024
@nieder nieder linked an issue Dec 30, 2024 that may be closed by this pull request
am__v_texidevnull_1 =
-INFO_DEPS = texinfo.info info-stnd.info texi2any_api.info
+#INFO_DEPS = texinfo.info info-stnd.info texi2any_api.info
+INFO_DEPS =
Copy link
Contributor

@dhomeier dhomeier Dec 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless I am missing something, this is the only actual change – the others below are already commented out.
Not sure what to make of the "...info documentation, it has been removed" comment either; those .info files are built and installed into %p/share/info, and without that patch exactly the same number of files is installed.
It seems $(INFO_DEPS) is only ever referred to in the uninstall-info-am and maintainer-clean-aminfo targets, which are probably irrelevant for the Fink build.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, that patch is a mess because the original Debian patch comments out INFO_DEPS, TEXINFOS, and info_TEXINFOS, but then @akhansen undid all but INFO_DEPS but in a weird way.
Compare https://raw.githubusercontent.com/debian-tex/texinfo/00a08ac10804f2fc712c3372940e1535850d1eed/debian/patches/dont_build_info and https://raw.githubusercontent.com/fink/fink-distributions/560b8a84237ecd880a58a3d3152704ee9cc93a88/10.9-libcxx/stable/main/finkinfo/text/texinfo-dont_build_info.patch side-by-side. I've left the patch logic as if for now since it's what we have had for 8 years, but I think we might be able to get rid of it since like you said, there's no change in the installed content.

@dmacks
Copy link
Member

dmacks commented Dec 31, 2024

Check ffmpeg builds with the new texinfo. Might need to be patched and versioned BDep, since they apparently use non-stable internal APIs. See https://lists.gnu.org/archive/html/bug-texinfo/2024-12/msg00081.html

@nieder
Copy link
Member Author

nieder commented Jan 3, 2025

freshly commited ffmpeg-6.1.2 is patched to work with texinfo-6.8 (as before) and now with 7.2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
new upstream Package has an updated upstream version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

gawk-5.3.1-1 installs a file in the info dir that isn't an info file
3 participants