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

update libkdtree #18073

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

update libkdtree #18073

wants to merge 1 commit into from

Conversation

mosfet80
Copy link
Contributor

update libkdtree to last version

@hyarion
Copy link
Contributor

hyarion commented Nov 23, 2024

How about using a submodule for this instead? That way:

  • we can more easily update it in the future
  • more secure updates, this update is so big that it is difficult to review that no malicious code has been added

@chennes
Copy link
Member

chennes commented Nov 26, 2024

@wwmayer what do you think about migrating to a submodule, as @hyarion suggests?

@chennes chennes requested a review from wwmayer November 26, 2024 16:19
Copy link
Contributor

@wwmayer wwmayer left a comment

Choose a reason for hiding this comment

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

Yes, we can make it a sub-module.

@wwmayer
Copy link
Contributor

wwmayer commented Nov 27, 2024

we can more easily update it in the future

Sure.

more secure updates, this update is so big that it is difficult to review that no malicious code has been added

It's not really big. Most of the PR is about to put the automake stuff back that we will never use. The only change actually is to re-enable the copy constructor of the iterator class.

The copy constructor once has been disabled with 3883ef3 because it caused some compiler warnings in the mesh module. So, when we make this a sub-module is there a way to apply a patch to disable the copy constructor again?

@hyarion
Copy link
Contributor

hyarion commented Nov 27, 2024

So, when we make this a sub-module is there a way to apply a patch to disable the copy constructor again?

As far as I know, you can't apply local patches directly to submodules. Instead, the process would look like this:

  • Fork the libkdtree repository to create a FreeCAD/libkdtree repository.
  • Apply your local patch(es) in the FreeCAD/libkdtree fork.
  • Use the FreeCAD/libkdtree fork as the submodule in your FreeCAD repository.

When you want to pull in changes from the original libkdtree repository, the process is as follows:

  • In the FreeCAD/libkdtree fork, pull changes from the upstream repository and either merge them into or rebase your local patches onto the updated code.
  • Push the updated fork, including your patches, to the FreeCAD/libkdtree repository.
  • In the FreeCAD repository, update the submodule to point to the latest commit in your FreeCAD/libkdtree fork.

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.

4 participants