Upstream merge conflict #1
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…com/albert-github/doxygen into albert-github-feature/bug_hide_compound_reference
Without the change `doxygen` fails to run when built against
`i686-linux` target and installed on thew filesystem with 64-bit
inodes (`btrfs` with many files in my case):
$ doxygen -g && doxygen && echo ok
Configuration file 'Doxyfile' created.
...
error: Doxyfile not found and no input file specified!
This happens because the inode number is outside 32-bit values:
$ stat Doxyfile
...
Device: 0,31 Inode: 11833552292 Links: 1
After the change the doc generation succeeds as expected:
$ doxygen -g && doxygen && echo ok
...
ok
The change enables the respective macros to enable 64-bit API.
In case `CASE_SENSE_NAMES=YES` the directory name `TestKernel` was matched with `EXCLUDE_PATTERNS=*/test*` on Windows. When introducing the settings `SYSTEM` / `YES` / `NO` for `CASE_SENSE_NAMES` in: ``` Commit: f41a679 [f41a679] Date: Thursday, August 18, 2022 3:23:54 PM issue #9236 doxygen x_noenv should always diff system-dependent settings Making the `CASE_SENSE_NAMES` settings an enum with values `SYSTEM`, `YES` and `NO`. In case `SYSTEM` is chosen the value is, system dependently changed at runtime. ``` no automatic overruling should take place anymore.
The value `.ixx` was mentioned twice with configuration setting `FILE_PATTERNS`
Handling of case sensitive file / directory names
Correction of translation error
issue #11525 Translation error Dutch
…e_value Value mentioned twice with configuration setting `FILE_PATTERNS`
…contents When linking to pages / sections prefer the version with the "prefix" (i.e. local version) but when no match is found also try the one without "prefix" (i.e. global version).
The category in respect to `ExampleLineno` was incorrect
When an included file is not terminated by means of a `\n` it is possible that we get a warning like: ``` warning: More #if's than #endif's found (might be in an included file). ``` adding the `\n`, as already done with files that are "normally" preprocessed , solves the problem
- llvm suggests we should use _LIBCPP_HARDENING_MODE rather than _LIBCPP_ENABLE_ASSERTIONS and they are about to remove _LIBCPP_ENABLE_ASSERTIONS from llvm's sources at all, so we need to prepare - libstdc++ uses _GLIBCXX_ASSERTIONS, libc++ by llvm uses _LIBCPP_HARDENING_MODE, so let's use them separately Signed-off-by: Denis Pronin <[email protected]>
doc: Dependencies for testing
fix: fix regression of #11390
Spelling corrections
…b/doxygen into albert-github-feature/issue_11631
When looking at the bibliography we see that there is a difference in the handling of backticks and single quotes between LaTeX and the other formats. In LaTeX they are translated in a similar way as nowadays is done in Markdown but in the other formats they are shown literally. The bibliography items are,correctly, not run through the markdown processor as the entries are in LaTeX style. By replacing the backticks and single quotes by the required HTML entities in the rapper script the problem is solved.
Handling of backticks in bibliography
Escape the backslash in the separator
Workaround. An attempt to overcome the build problems by not trying to load the windows LaTeX package and not running any tests (as also e.g. HTML uses LaTeX by means of bibtex) and generation documentation on windows
Incorrect test corrected
# Conflicts: # .github/workflows/build_cmake.yml
Removing explicit tables code from source code so it might be easier maintainable / there might be easier to create workarounds.
…ws_latex Attempt to overcome build problems
Removing explicit tables code from source code
Qt doesn't compile anymore on my Sequoia system without it.
…b/doxygen into albert-github-feature/issue_11647
Fix issues when comparing stripped paths due to improper handling of empty stripped paths. Fixes: #6178 Fixes: #11261 Signed-off-by: Benjamin Cabé <[email protected]>
Fix findFileDef incorrectly flagging ambiguities
…eral with double quotes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Upstream merge conflict with the fork by @shahmoradi