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.

Sign up for GitHub

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

Jump to bottom

build: support webkit2gtk-4.1 #794

Merged
merged 6 commits into from
Jan 24, 2023
Merged

build: support webkit2gtk-4.1 #794

merged 6 commits into from
Jan 24, 2023

Conversation

bobby285271
Copy link
Member

@bobby285271 bobby285271 commented Jul 22, 2022 •
edited
Loading

Just packaged evolution-data-server 3.45.1 and built this, seems to work. But I am really not sure what I am doing, @decathorpe can you help test this a bit?

Closes #793

@bobby285271 bobby285271 changed the title build: support evolution-data-server 3.45 build: support webkit2gtk-4.1 Jul 22, 2022
@bobby285271 bobby285271 force-pushed the webkit2gtk-4.1 branch 2 times, most recently from 9784721 to 6320081 Compare July 23, 2022 02:41
@decathorpe
Copy link
Contributor

Have you checked whether this code actually still compiles with older versions of e-d-s? For example, I'm not sure whether replacing all uses of Soup.URI with Glib.Uri is compatible with both cases, and we might need conditional compilation.

@bobby285271
Copy link
Member Author

bobby285271 commented Jul 23, 2022 •
edited
Loading

Ugh... Actually this (6320081) still builds and runs for me on nixos-unstable (with everything GNOME 42 e.g. e-d-s 3.44.3). For Soup.URI -> GLib.Uri, I actually think that is compatible for both cases, for example gnome-software is updating that unconditionally when doing a conditional port 🤔. I can update that if requested, give me a sec :-)

decathorpe
decathorpe reviewed Jul 26, 2022
View reviewed changes
docs/meson.build Outdated Show resolved Hide resolved
@bobby285271 bobby285271 mentioned this pull request Jul 26, 2022
Merged
@decathorpe
Copy link
Contributor

I can confirm that this PR fixes the build against evolution-data-server 3.45+ with webkit2gtk-4.1, and keeps building with earlier versions.

@decathorpe
Copy link
Contributor

The patch from this PR no longer applies on top of the master branch, can you please rebase?

meisenzahl
meisenzahl requested changes Jan 23, 2023
View reviewed changes
Copy link
Member

@meisenzahl meisenzahl left a comment

Choose a reason for hiding this comment

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

There are 2 warnings about unhandled errors, which I fixed by code suggestion.

webkit-extension/MailPage.vala Outdated Show resolved Hide resolved
src/Application.vala Outdated Show resolved Hide resolved
@meisenzahl meisenzahl mentioned this pull request Jan 23, 2023
Merged
6 tasks
@bobby285271 @meisenzahl
Try-catch GLib.Uri.parse
5157f41 
Co-authored-by: Marius Meisenzahl <meisenzahl@users.noreply.github.com>
@bobby285271 bobby285271 marked this pull request as draft January 24, 2023 03:18
@bobby285271 bobby285271 marked this pull request as ready for review January 24, 2023 03:39
@meisenzahl meisenzahl merged commit 9e6eb73 into elementary:master Jan 24, 2023
@bobby285271 bobby285271 deleted the webkit2gtk-4.1 branch January 24, 2023 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@decathorpe decathorpe decathorpe left review comments

@meisenzahl meisenzahl meisenzahl approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

support for webkit2gtk-4.1 / evolution-data-server 3.45+ / libsoup-3
4 participants
@bobby285271 @decathorpe @meisenzahl @marbetschar