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

[20.03] Fix ibus #95206

Merged
merged 12 commits into from Aug 13, 2020
Merged

[20.03] Fix ibus #95206

merged 12 commits into from Aug 13, 2020

Conversation

worldofpeace
Copy link
Contributor

@worldofpeace worldofpeace commented Aug 11, 2020

Motivation for this change

Backports the following PRs to stable:
#86416 #85515
#85976 (so we can test that we didn't break wrapGAppsHook on stable with the backports)
#85892 #85970 #85992

The following commits don't belong to a PR:
76f7fc1
c9d988b

This is another minor bugfix that I thought I might as well backport.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

…rapperArgsHook

gappsWrapperArgsHook tries to collect GI_TYPELIB_PATH environment variable so if we want it to see the path giDiscoverSelf adds, we need to force the order.

(cherry picked from commit 8f7387f)
@jtojnar
Copy link
Contributor

jtojnar commented Aug 11, 2020

Maybe we should backport #85976 too.

(cherry picked from commit 49b89af)
(cherry picked from commit 0be3b18)
@worldofpeace
Copy link
Contributor Author

Maybe we should backport #85976 too.

Good idea. Pushed.

@worldofpeace
Copy link
Contributor Author

Ahh, I need to backport #85992 too

symphorien and others added 8 commits August 11, 2020 14:41
Fixes this warning at ibus-daemon startup:

(ibus-dconf:15691): dconf-WARNING **: 21:49:24.018: unable to open file '/etc/dconf/db/ibus': Failed to open file ?/etc/dconf/db/ibus?: open() failed: No such file or directory; expect degraded performance

(cherry picked from commit a71dc0b)
(cherry picked from commit 5b7ffe6)
Fixes this warning at ibus-daemon startup:

(ibus-dconf:15691): dconf-WARNING **: 21:49:24.018: unable to open file '/etc/dconf/db/ibus': Failed to open file ?/etc/dconf/db/ibus?: open() failed: No such file or directory; expect degraded performance

(cherry picked from commit 3dbd629)
This reverts commit ee5cba2.

(cherry picked from commit 11d6318)
Need to reference through `config` when checking what other modules have set.

(cherry picked from commit c9d988b)
@worldofpeace worldofpeace changed the title [20.03] gobject-introspection: Ensure the giDiscoverSelf is run before gappsW… [20.03] Fix ibus Aug 11, 2020
@worldofpeace
Copy link
Contributor Author

worldofpeace commented Aug 11, 2020

Okay, now this backport PR got larger than I first intended.

I can now properly test if ibus is working
@ofborg test installed-tests.ibus

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants