Skip to content

Reintegrate QtWebKit back into master with new patches #63

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

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

Conversation

fryelum
Copy link
Member

@fryelum fryelum commented Mar 8, 2025

Fixes QtWebKit to build using a mix of our old patches and introducing some new ones. Haven't tested actual local usage, though it was buggy before, and almost certainly still will be just as bad now. Would love all of the reviewers' opinions on putting QtWebKit back in master, rather than keeping it to its own branch.

Whoops, didn't mean to make you all assignees, I meant to make you guys reviewers, it's late 🤣

@fryelum fryelum changed the title QtWebKit patches Reintegrate QtWebKit back into master with new patches Mar 8, 2025
@kristibektashi
Copy link

What are the advantages and disadvantages of putting it back into master vs keeping it to it's own branch?

@pahaze
Copy link
Member

pahaze commented Mar 8, 2025

Remerging into master allows anybody to easily just download MXE as normal and build QtWebKit without needing anything special. A lot of inexperienced devs don't know their way around Git too much, and needing special branches and a whole separate build environment just for one library is a lot, especially given how large the output of the libraries add up to be per each build env.

However, leaving it to its own branch allows us to make more "dangerous" changes as we debug more, though we can do that with master as well, or merge what we currently have as a base into master, while leaving the dangerous stuff to a new branch (perhaps component/qtwebkit-debug?)

Copy link

@kristibektashi kristibektashi left a comment

Choose a reason for hiding this comment

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

That last idea (merging the current base into master while having a separate branch for more dangerous changes) sounds like the best idea to me.

In fact, it's what most people do, having a "stable" branch where things are unlikely to break as much and a separate "experimental/development/staging" branch where the more dangerous/experimental changes are made before being stabilized and merged into master.

So I suggest doing just that, merging the "safer" changes into master while having a separate branch for the more "dangerous" ones.

@wmjb
Copy link

wmjb commented Mar 8, 2025

successfully built on ubuntu 20.04 with this commit

@utf-4096
Copy link
Contributor

utf-4096 commented Mar 8, 2025

builds on glibc void linux

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.

7 participants