leptonica/1.87.0 package update

[octo-sts]

Commit: 13275a278eb55b5746e33f95fbf5a2c8f604b3ab

Note: If you need to make manual changes to this PR, apply the skip:staging-update-bot label so the reconciler won't overwrite them.

[octo-sts]

🩹 Build Failed: Patch Application Failed

failed to cherry-pick e0936377f9094b72f7f2ea6bc34311ccc69b2f71 from branch master

Build Details

Category	Details
Build System	melange
Failure Point	git cherry-pick -x e0936377f9094b72f7f2ea6bc34311ccc69b2f71

Root Cause Analysis 🔍

The cherry-pick operation failed because the patch is now empty after conflict resolution. The commit e0936377f9094b72f7f2ea6bc34311ccc69b2f71 from master branch could not be applied to the current checkout of tag 1.87.0, likely because the changes already exist in the target or there are conflicts that make the patch redundant.

---

🔍 Build failure fix suggestions

Found similar build failures that have been fixed in the past and analyzed them to suggest a fix:

Similar PRs with fixes

• pdns-5.2/5.2.6 package update #69703

Suggested Changes

File: leptonica.yaml

• version_update at line 3 (package.version)
  Original:

version: "1.87.0"

Replacement:

version: "1.88.0"

Content:

Update package version to 1.88.0 which likely includes the cherry-picked changes

• commit_update at line 26 (pipeline.git-checkout.expected-commit)
  Original:

expected-commit: 13275a278eb55b5746e33f95fbf5a2c8f604b3ab

Replacement:

expected-commit: [commit-hash-for-1.88.0-tag]

Content:

Update expected-commit to match the 1.88.0 tag commit hash

• removal at line 27-28 (pipeline.git-checkout.cherry-picks)
  Original:

cherry-picks: |
        master/e0936377f9094b72f7f2ea6bc34311ccc69b2f71: cmake: fix pkg-config entry requires

Content:

Remove the cherry-picks section entirely as the fix is now included in 1.88.0

Click to expand fix analysis

Analysis

All three similar fixes follow an identical pattern: when a cherry-pick fails due to an empty commit (meaning the changes are already present in the newer version), the solution is to remove the cherry-pick entirely and update to a newer version of the package. In each case, the cherry-pick became unnecessary because the upstream changes were already incorporated in the newer release. The fixes involved: 1) Removing the entire cherry-picks section from git-checkout, 2) Updating the package version to a newer release, 3) Updating the expected-commit to match the new version tag, and 4) Resetting the epoch to 0.

Click to expand fix explanation

Explanation

The cherry-pick failure occurs because the commit e0936377f9094b72f7f2ea6bc34311ccc69b2f71 (cmake: fix pkg-config entry requires) is already included in or conflicts with the 1.87.0 tag. Following the established pattern from similar fixes, the solution is to update to a newer upstream version where this fix is naturally incorporated. Version 1.88.0 likely contains the cmake pkg-config fix, making the cherry-pick redundant. This approach aligns with Wolfi's principle of using the latest upstream versions and eliminates the need for manual patches when upstream has already integrated the required changes.

Click to expand alternative approaches

Alternative Approaches

• Use --allow-empty flag in git cherry-pick to proceed despite empty commit, but this is not recommended as it creates unnecessary empty commits
• Skip the cherry-pick entirely without version update, but this might leave the package without the intended cmake fix
• Apply the cherry-pick changes manually as a patch file instead of using git cherry-pick, but this adds maintenance overhead

---

Was this comment helpful? Please use 👍 or 👎 reactions on this comment.