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

fix fribidi includes #1616

Merged
merged 2 commits into from
Jun 11, 2023
Merged

Conversation

benoit-pierre
Copy link
Contributor

@benoit-pierre benoit-pierre commented Jun 11, 2023

▸ pkg-config --cflags fribidi
-I/usr/include/fribidi

Otherwise, using fribidi/fribidi.h may result in the wrong (system) include being picked up when building the emulator.


This change is Reviewable

@benoit-pierre benoit-pierre marked this pull request as draft June 11, 2023 17:59
@benoit-pierre
Copy link
Contributor Author

This depends on koreader/crengine#519.

@poire-z
Copy link
Contributor

poire-z commented Jun 11, 2023

Fine with me, but not as familiar with build stuff as @NiLuJe and @Frenzie .
Btw, how is it that picking system include does not happen for other stuff ? Is it just because I added this single occurence of an include with a subdir ?

@benoit-pierre
Copy link
Contributor Author

It does not happen right now, but if you're messing with the build system, it's easy to get the wrong include because of it.

@poire-z
Copy link
Contributor

poire-z commented Jun 11, 2023

No longer needs to be "Draft" ?

@benoit-pierre
Copy link
Contributor Author

Yeah, I was waiting for the macOS check.

@benoit-pierre benoit-pierre marked this pull request as ready for review June 11, 2023 19:45
@Frenzie Frenzie merged commit e3f0c99 into koreader:master Jun 11, 2023
2 checks passed
@benoit-pierre benoit-pierre deleted the pr/fix_fribidi_includes branch June 11, 2023 19:50
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.

None yet

4 participants