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

Fix: Compatibility with Qt5 + CPack configuration in CMakeLists + bump versions/cleanup files #117

Merged

Conversation

tetektoza
Copy link
Contributor

@tetektoza tetektoza commented Oct 18, 2023

This patch adds CPack configuration to CMakeLists so CONTROL file for .deb packages can be deleted, it also removes the file + removes build-deb.sh since CPack will handle packaging now.

@tetektoza tetektoza force-pushed the fix_compatibility_with_qt5_control_file branch from 1ac0cd8 to 9c3764e Compare October 18, 2023 18:18
@tetektoza tetektoza marked this pull request as draft October 18, 2023 18:19
AJenbo
AJenbo previously approved these changes Oct 18, 2023
Copy link
Member

@AJenbo AJenbo left a comment

Choose a reason for hiding this comment

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

Looks good 👍

@tetektoza tetektoza force-pushed the fix_compatibility_with_qt5_control_file branch 2 times, most recently from a971c38 to 6579344 Compare October 19, 2023 09:34
@tetektoza tetektoza changed the title Fix: Compatibility with qt5 in control file in .deb package Fix: Compatibility with Qt5 + CPack configuration in CMakeLists + bump versions/cleanup files Oct 19, 2023
@tetektoza tetektoza force-pushed the fix_compatibility_with_qt5_control_file branch 2 times, most recently from 2b5ad6f to 5b717df Compare October 19, 2023 10:48
CMakeLists.txt Outdated Show resolved Hide resolved
@tetektoza tetektoza force-pushed the fix_compatibility_with_qt5_control_file branch from 5b717df to e782006 Compare October 19, 2023 12:34
@@ -1,5 +1,5 @@
[Desktop Entry]
Version=0.5.0
Version=1.0.0
Copy link
Member

Choose a reason for hiding this comment

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

I don't think this is actually has any benefits and with out it we will have one less things we have to remember to update on release.

Suggested change
Version=1.0.0

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done. I've added a couple of fields for the package, like section in which package lies, homepage of the package repository, description.

Copy link
Member

Choose a reason for hiding this comment

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

I think you just reverted it rather then remove the line, i did so here: 1090703

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah right, my bad, didn't see it's line removal on commit change rather than character change.

@tetektoza tetektoza force-pushed the fix_compatibility_with_qt5_control_file branch from e782006 to 7a7905f Compare October 19, 2023 13:56
This patch adds CPack configuration to CMakeLists so CONTROL file for
.deb packages can be deleted, and we can setup everything through cmake.
@tetektoza tetektoza force-pushed the fix_compatibility_with_qt5_control_file branch from 7a7905f to b5f2480 Compare October 19, 2023 14:03
This patch removes CONTROL file from DEBIAN directory, as well as
build-deb.sh script, since we started using CPack for packaging on debian.
@tetektoza tetektoza force-pushed the fix_compatibility_with_qt5_control_file branch from b5f2480 to f9eed72 Compare October 19, 2023 14:04
@AJenbo AJenbo marked this pull request as ready for review October 19, 2023 14:07
@AJenbo AJenbo merged commit 30b5a8e into diasurgical:master Oct 19, 2023
4 of 5 checks passed
@tetektoza tetektoza deleted the fix_compatibility_with_qt5_control_file branch October 19, 2023 14:47
pionere pushed a commit to pionere/d1-graphics-tool that referenced this pull request Oct 20, 2023
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.

2 participants