-
Notifications
You must be signed in to change notification settings - Fork 138
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
Add Buildrequires for fontawesome #4569
Conversation
The right file should now be installed to link to, but I still need to create the link for the CMake build somehow. |
Hi @edewata, I think I am partway fixed. I'm not sure what the best way to create the symlink is in cmake as it is conditional on a particular version of Fedora and we don't have access to the nice spec file macros. Any ideas? The alternative, as this all works at run-time and is failing in a test only, we could simply exclude the fonts using |
I think we can use |
3bc90a9
to
c9c7932
Compare
@edewata - I'm a bit confused by this now, as |
Looks like the link to Lines 960 to 969 in c8fd8aa
so now the link will be created by CMake (which will work on all platforms) instead of by rpmbuild (which will only work on certain platforms). |
2557857
to
a385a3a
Compare
Ah, yes I've misunderstood what was happening, thanks for the clarification! I have fixed the merge conflict and I think now the CI will pass. |
@edewata - yep, it works, thanks again! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the update! There's a test failure, but feel free to fix and merge.
@@ -15,6 +15,8 @@ add_custom_command( | |||
COMMAND ln -sf ../../../../../..${DATA_INSTALL_DIR}/common-ui/ocsp links/ | |||
COMMAND ln -sf ../../../../../..${DATA_INSTALL_DIR}/common-ui/pki.properties links/pki.properties | |||
COMMAND ln -sf ../../../../../..${DATA_INSTALL_DIR}/common-ui/tks links/ | |||
COMMAND ${CMAKE_COMMAND} -E make_directory fonts | |||
COMMAND ln -sf ../../../../../..${DATA_INSTALL_DIR}/common-ui/fonts/${FONTAWESOME_WEBFONT} fonts/fontawesome-webfont.woff |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like rpminspect
failed because the link is incorrect. The final location for the link is /usr/share/pki/common-ui/fonts
so it only needs 5 ..
's.
This resolves a disparity in installed files between rpmbuild and cmake now that fontawesome is not bundled anymore. The symlink generation to the external font files is moved to cmake from the spec file to make it platform agnostic.
Kudos, SonarCloud Quality Gate passed! |
Thanks @edewata ! |
This resolves a disparity in installed files between Maven and CMake now that fontawesome is not bundled in the CMake build anymore.
This happens because
font-awesome
is not available at build time so there is no file to link to for the comparison.