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

Jump to bottom

Xpra: 3.0.9 -> 4.0.2 #88526

Merged
merged 1 commit into from Jun 9, 2020
Merged

Xpra: 3.0.9 -> 4.0.2 #88526

merged 1 commit into from Jun 9, 2020

Conversation

mjlbach
Copy link
Contributor

@mjlbach mjlbach commented May 21, 2020 •
edited

Motivation for this change

Bump xpra version to 4.x series.

cc:
@lourkeur @offlinehacker

Things done

I was having issues with KDE (#88035), which I reported upstream. I patched pyxdg which is now merged in nixpkgs. There is a workaround for pyxdg issues in 4.0.2, which isn't strictly needed anymore, but we should still do the version bump.

  • 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.

@mjlbach mjlbach changed the title Xpra: 3.0.9 -> 4.0.1, fix patches, fix on KDE Xpra: 3.0.9 -> 4.0.1, fix patches, fix on KDE (#88035) May 21, 2020
@mjlbach mjlbach changed the title Xpra: 3.0.9 -> 4.0.1, fix patches, fix on KDE (#88035) Xpra: 3.0.9 -> 4.0.1, update patches, fix on KDE (#88035) May 21, 2020
@mjlbach mjlbach mentioned this pull request May 21, 2020
Open
6 tasks
@mjlbach
Copy link
Contributor Author

mjlbach commented May 21, 2020 •
edited

Edit: Ok, strange the exact same thing that happened to me before (where I was able to initially start/attach to xpra happened again, and now I'm reproducing #88035. It happens only after I restart...

Could this possibly be related to #87152?

@mjlbach mjlbach changed the title Xpra: 3.0.9 -> 4.0.1, update patches, fix on KDE (#88035) Xpra: 3.0.9 -> 4.0.1, update patches May 21, 2020
@mjlbach
Copy link
Contributor Author

mjlbach commented May 22, 2020

From: totaam via IRC:

 XPRA_EXPORT_XDG_MENU_DATA=0
or --start-new-commands=no
the second one is more restrictive
or wait for 4.0.2

@mjlbach
Copy link
Contributor Author

mjlbach commented May 22, 2020

Ok, I backported a patch from the upcoming 4.0.2 which should be removed upon the next version bump. It bypasses the problem with pyxdg (but doesn't fix whatever is going on on nix with XDG_DATA_DIRS and pyxdg.

@mjlbach mjlbach force-pushed the xpra_version_bump branch 2 times, most recently from 753dce5 to ee3a1d1 Compare June 5, 2020 15:57
@mjlbach mjlbach changed the title Xpra: 3.0.9 -> 4.0.1, update patches Xpra: 3.0.9 -> 4.0.2, update patches Jun 5, 2020
@mjlbach
Copy link
Contributor Author

mjlbach commented Jun 5, 2020

@offlinehacker @lourkeur The patch is now in upstream so I've updated the commit. This should be good to merge and backport.

@mjlbach mjlbach changed the title Xpra: 3.0.9 -> 4.0.2, update patches Xpra: 3.0.9 -> 4.0.2 Jun 5, 2020
bbjubjub2494
bbjubjub2494 approved these changes Jun 5, 2020
View reviewed changes
Copy link
Member

@bbjubjub2494 bbjubjub2494 left a comment

Choose a reason for hiding this comment

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

  • Ensure that the package versioning fits the guidelines.
  • Ensure that the commit text fits the guidelines.
  • Ensure that the package maintainers are notified.
  • Ensure that the meta field information is correct. (Still GPL-2+)
  • Ensure that the code contains no typos.
  • Building the package locally. (NixOS 20.03, x86_64)
  • Function test on my usual workflow: Xpra-over-ssh into a nixos-container.

@bbjubjub2494 bbjubjub2494 mentioned this pull request Jun 5, 2020
Merged
10 tasks
jonringer
jonringer approved these changes Jun 9, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

failures are broken on target branch

https://github.com/NixOS/nixpkgs/pull/88526
1 package failed to build:
ib-controller

2 packages built:
run-scaled xpra

@jonringer
Copy link
Contributor

trusting the good word of @lourkeur to have tested the end-to-end scenario :)

@jonringer jonringer merged commit e5b7f13 into NixOS:master Jun 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@bbjubjub2494 bbjubjub2494 bbjubjub2494 approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mjlbach @jonringer @bbjubjub2494