1.1 KiB
1.1 KiB
cef
The cef package
This package is based on rpms/chromium.git. To make cherry-picking and merging changes easier, the chromium.git history can be grafted onto this history like this:
git remote add upstream https://src.fedoraproject.org/rpms/chromium.git
git fetch upstream
git replace a4ced8d15f2fff3b544a6e09e37e6d51a3b741e0 e5d715b3d601af44fe2b6611a3c700b0fe3c5e86
Then you can directly cherry-pick commit ranges from the chromium package. Use cherry-pick like this to pick up the spec file rename:
git cherry-pick -X rename-threshold=10% UPSTREAM_COMMIT
Most cherry-picks will cause these trivial conflicts:
sourcesfile (trivial merge)- Changelog (remove, we use autochangelog)
- Chromium version number in package metadata (ignore the hunk and apply the version change directly
to
chromium_majorand related variables)
We cherry-pick all upstream commits that touch the spec file anywhere that has not been removed, even if the changes are irrelevant to the CEF build (e.g. ppc64le fixes, since that arch is not supported by CEF). This helps keep the file in sync and reduce conflicts later on.