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

Adapt to GLib 2.79 documentation #612

Merged
merged 2 commits into from
Jan 29, 2024
Merged

Conversation

ppisar
Copy link
Collaborator

@ppisar ppisar commented Jan 26, 2024

This patchset first moves a code in the build script, and then implements a special case GLib ≥ 2.79.0. If the special case proves unproductive, we will turned it into a skip later. This is a more compatible approach comparing to PR #611.

A checks and an application of extra directories for gtkdoc-fixxref
were computed independetly. This patch removes the code duplication.
It also adds the discovered path to a "meson setup" summary output.
GLib 2.79.0 switched from gtk-doc to gi-docgen, whose format and
installation location are both not compatible. The libmodulemd build
script reported an error because of the new location.

This patch fixes the build failure by using the new location if GLib
is 2.79.0 or greater.

Although the libmodulemd documentation references to GLib remain
unresolved now (i.e. names of the functions and the types are not
hyperlinks), we keep using the new location because the new GLib
*.devhelp2 indices remain there and they can only improve over the
time.

If this expection does not fulfill, libmodulemd will either migrate to
gi-docgen, or drop the hard build-time dependency on GLib
documentation.

Reimplements: fedora-modularity#611
Copy link
Collaborator

@sgallagher sgallagher left a comment

Choose a reason for hiding this comment

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

It's unfortunate that the doc links are broken. I think we need to unbreak the build failure immediately, so I'm approving the ticket.

In a follow-up patch, could we modify .ci/ci-docs.sh to pin the documentation generation on F39 for now, so that we push the properly-linked version to the web?

@ppisar ppisar merged commit 29c339a into fedora-modularity:main Jan 29, 2024
23 checks passed
ppisar added a commit that referenced this pull request Jan 29, 2024
glib-2.79.0 available since Fedora ≥ 40 changed a documentation format
and references in libmodulemd documentation do not resolve to glib
documentation anymore.

To have an on-line documentation with the hyperlinks, keep using older
Fedora. See
<#612>.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants