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

leptonica: fix with_{gif|jpeg|png|tiff|openjpeg|webp}=False #23855

Merged
merged 1 commit into from
Jun 6, 2024

Conversation

db4
Copy link
Contributor

@db4 db4 commented May 3, 2024

Specify library name and version: leptonica/all

Non-default with_* options were broken; closes #16906


@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 1 (f13f461f03ae4c812f05c163aecadfa133de4b67):

  • leptonica/1.81.0:
    All packages built successfully! (All logs)

  • leptonica/1.83.0:
    All packages built successfully! (All logs)

  • leptonica/1.83.1:
    All packages built successfully! (All logs)

  • leptonica/1.82.0:
    All packages built successfully! (All logs)

  • leptonica/1.79.0:
    All packages built successfully! (All logs)

  • leptonica/1.80.0:
    All packages built successfully! (All logs)

  • leptonica/1.78.0:
    All packages built successfully! (All logs)


Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 1 (f13f461f03ae4c812f05c163aecadfa133de4b67):

  • leptonica/1.83.1:
    All packages built successfully! (All logs)

  • leptonica/1.82.0:
    All packages built successfully! (All logs)

  • leptonica/1.81.0:
    All packages built successfully! (All logs)

  • leptonica/1.78.0:
    All packages built successfully! (All logs)

  • leptonica/1.80.0:
    All packages built successfully! (All logs)

  • leptonica/1.79.0:
    All packages built successfully! (All logs)

  • leptonica/1.83.0:
    All packages built successfully! (All logs)

Copy link
Contributor

github-actions bot commented May 3, 2024

Hooks produced the following warnings for commit f13f461
leptonica/1.79.0@#01eb838659a265411f87d04ce7fb2c5c
post_package(): WARN: [APPLE RELOCATABLE SHARED LIBS (KB-H077)] install_name dir of these shared libs is not @rpath: libleptonica.dylib, libleptonica.1.79.0.dylib, libleptonica.5.3.0.dylib
leptonica/1.80.0@#a766ca25cfbd87d5849c728e31c32406
post_package(): WARN: [APPLE RELOCATABLE SHARED LIBS (KB-H077)] install_name dir of these shared libs is not @rpath: libleptonica.dylib, libleptonica.5.4.0.dylib, libleptonica.1.80.0.dylib
leptonica/1.78.0@#e719ec3cf52d30112fd605f64c0796a2
post_package(): WARN: [APPLE RELOCATABLE SHARED LIBS (KB-H077)] install_name dir of these shared libs is not @rpath: libleptonica.dylib, libleptonica.1.78.0.dylib, libleptonica.5.3.0.dylib

@AbrilRBS AbrilRBS self-assigned this May 4, 2024
Copy link
Member

@AbrilRBS AbrilRBS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot! Could you please provide some compilation logs of the non-default cases not covered by CI? (A before-after would be great, but the before is already provided in the linked issue so no need to) - It'd help tremendously with future traceability and maintenance if we leave a trail of things working now :)

Thanks!

@db4
Copy link
Contributor Author

db4 commented May 5, 2024

@RubenRBS I tested the PR correctness with the following script:

import subprocess

options = {
    "with_zlib": False,
    "with_gif": False,
    "with_jpeg": False,
    "with_png": False,
    "with_tiff": False,
    "with_openjpeg": False,
    "with_webp": False,
}

opts = ' '.join([f'-o "leptonica/*:{k}={v}"' for (k,v) in options.items()])

for v in ["1.78.0", "1.79.0", "1.80.0", "1.81.0", "1.82.0", "1.83.0", "1.83.1"]:
    subprocess.run(f"conan create . --version {v} {opts}", shell=True, check=True)

Everything builds OK; if you need the whole log, please let me know and I'll attach it.

@uilianries
Copy link
Member

@db4 Could you please provide the logs? In case Github complains about the size, you still can open a separated note in gist.github.com

Having the logs we have not only a source for reviewing now, but also to compare any change in the future.

@db4
Copy link
Contributor Author

db4 commented May 20, 2024

@db4 Could you please provide the logs?

Ok, here they are:
build_log.txt

Copy link
Member

@uilianries uilianries left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just checked the build.log and looks good, no warning related to replace_in_file.

Copy link
Contributor

@ericLemanissier ericLemanissier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since 1.84.0 it is not necessary to patch the cmake files, we can disable dependencies using ENABLE_FOO cf DanBloomberg/leptonica@e2ba2b3

@perseoGI perseoGI self-assigned this Jun 6, 2024
Copy link
Contributor

@perseoGI perseoGI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@AbrilRBS AbrilRBS mentioned this pull request Jun 6, 2024
3 tasks
@conan-center-bot conan-center-bot merged commit 3cc9499 into conan-io:master Jun 6, 2024
44 checks passed
@db4 db4 deleted the leptonica branch June 7, 2024 04:12
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.

[package] leptonica/1.82.0: Doesn't patch sources if WEBP or other graphic formats turned off
6 participants