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 libraries #2130

Merged
merged 3 commits into from Feb 18, 2024
Merged

Update libraries #2130

merged 3 commits into from Feb 18, 2024

Conversation

DioEgizio
Copy link
Member

updated qt to 6.6.2
updated some submodules
updated sparkle framework to the latest version
(I tested and updating still works)

updated qt to 6.6.2
updated some submodules
updated sparkle framework to the latest version

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
cmark 0.31 removed CMARK_STATIC/CMARK_SHARED and replaced it with the native cmake BUILD_SHARED_LIBS

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
:/ oops

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
@DioEgizio DioEgizio added actions Issues and PRs related to GH actions and other CIs we might have changelog:changed A PR that appears under "Changed" in the changelog backport release-8.x Backport PR automatically labels Feb 17, 2024
@DioEgizio DioEgizio added this to the 8.1 milestone Feb 17, 2024
@DioEgizio DioEgizio merged commit dbdd96e into PrismLauncher:develop Feb 18, 2024
34 checks passed
@DioEgizio DioEgizio deleted the updates branch February 18, 2024 11:41
Copy link
Contributor

Backport failed for release-8.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-8.x
git worktree add -d .worktree/backport-2130-to-release-8.x origin/release-8.x
cd .worktree/backport-2130-to-release-8.x
git switch --create backport-2130-to-release-8.x
git cherry-pick -x 5d36067c749c55b4ca3ff37fa7382dcd54e60ca2 94b48e970241a122da43957ea457b29fa7ce499d 25b69b4c0d7d0b6863c7f158c382eb85cf040c14

@DioEgizio
Copy link
Member Author

Backport failed for release-8.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-8.x
git worktree add -d .worktree/backport-2130-to-release-8.x origin/release-8.x
cd .worktree/backport-2130-to-release-8.x
git switch --create backport-2130-to-release-8.x
git cherry-pick -x 5d36067c749c55b4ca3ff37fa7382dcd54e60ca2 94b48e970241a122da43957ea457b29fa7ce499d 25b69b4c0d7d0b6863c7f158c382eb85cf040c14

:/

DioEgizio added a commit to DioEgizio/PrismLauncher that referenced this pull request Feb 18, 2024
LunaisLazier pushed a commit to LunaisLazier/ShatteredPrism that referenced this pull request Feb 24, 2024
LunaisLazier pushed a commit to LunaisLazier/ShatteredPrism that referenced this pull request Feb 25, 2024
@Scrumplex Scrumplex changed the title chore: update libraries Update libraries Mar 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
actions Issues and PRs related to GH actions and other CIs we might have backport release-8.x Backport PR automatically changelog:changed A PR that appears under "Changed" in the changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants