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
Flatpak updates #65291
Flatpak updates #65291
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From https://github.com/flatpak/flatpak/releases/tag/1.3.4:
Improve ability to pull from multiple p2p sources (needs latest ostree).
Maybe we need to update that as well.
+# We copy the whole locale archive because we do not have C.UTF8 locale | ||
mkdir -p ${DIR}/usr/lib/locale/ | ||
-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US | ||
+cp @glibcLocales@/lib/locale/locale-archive ${DIR}/usr/lib/locale/locale-archive |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if we still do not need en_US
https://github.com/flatpak/flatpak/blob/eaec3a8203e5f8dc8b7f2282676981ff6d703110/common/flatpak-run.c#L1247
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this is not needed we can stop substituting glibcLocales
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps I can trying running the test to see.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Most Flatpak tests seem to pass so perhaps en_US
is not really needed.
Totally forgot about that one. Will do. |
7f8e106834be69161a4032b430e6d7ebbb4d9586...dba2ca26579635152a5e9d7c5789efa0777dbc01 has more patches than I'd like. Which is a problem I noticed with |
-if ret.returncode() != 0 | ||
- error('Missing documentation for GObject.') | ||
-endif | ||
+# ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Commented because these checks are kinda extra
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a common pain point when I use DevHelp. We need to come up with a way to fill in the paths and disseminate it upstream.
Some of the errors I see in a vm errorsThese are in the x11 session.
These are in the wayland sessionFor some reason it stalls to start for a very long time.
Probably a prime suspect
Too many more, what a headache 😄 |
After re-adding Running Edit: Yeah, |
Yeah, I got up to the point of
and gave up 😄 Good to see they're "fixed". Any ideas on how there could be a change upstream so we don't have to keep this patch? |
Hmm, weird. I can see the interface when I try to save a web page in Epiphany: But it still fails:
Actually, I can reproduce this on my production system, is that possibly a regression from #64575? |
Yeah, I should rebase this branch since that's all been worked out now. Edit: rebased onto #65449 Edit Edit: Confirmed that fixed this here. |
06e094a
to
2949cb1
Compare
I've confirmed that the issue I had with the wayland session and flatpak was a problem before this, and I believe I have another reporters confirmation of this #65449 (comment). I will undraft this. |
Now only
|
I don't think I know where to start to fix that test @jtojnar. Similar quoting issues? Noting that most of the cases pass I think we should merge this. |
I usually remove unsetting of If you do not feel like trying to decipher the shell scripts, merging is okay with me, and I will take a look when I get back. |
Thanks 👍 |
* Regenerated all patches for 1.4.2 and resolved any conflicts. * fix-test-paths.patch doesn't copy the whole locale archive because we have C.UTF8 now. * nixos/flatpak creates a Flatpak system helper user Change introduced in 1.3.2. Changes: See https://github.com/flatpak/flatpak/releases/tag/1.3.1 through 1.4.2.
* adapt respect-path-env-var.patch to code being moved around, etc. * Add json-glib https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.4.0
All patches synced. fix-1592.patch needed some new additions since that issue affects more test cases. https://github.com/ostreedev/ostree/releases/tag/v2019.2 Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
Includes a patch for the usual pygobject override stuff. Pending upstream submission.
2949cb1
to
ce0511e
Compare
Motivation for this change
See commit messages and release notes.
Lots of changes, new portals etc. (had to regenerate every patch)
With some light testing I think the background portal is causing some issues
in the gnome3 session, so this is a draft until I can fix that issue.
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)