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

xpra: 4.0.6 -> 4.1.3 #121893

Merged
merged 1 commit into from May 16, 2021
Merged

xpra: 4.0.6 -> 4.1.3 #121893

merged 1 commit into from May 16, 2021

Conversation

bbjubjub2494
Copy link
Member

Motivation for this change

https://github.com/Xpra-org/xpra/releases

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.

@bbjubjub2494 bbjubjub2494 marked this pull request as draft May 6, 2021 08:08
@bbjubjub2494
Copy link
Member Author

fails to build

Warning: Xorg binary not found, assuming the wrapper is needed!
creating build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/bin
copying fs/bin/xpra_Xdummy -> build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/bin (0o755)
chmod(build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/bin/xpra_Xdummy, 0o755)
copying fs/etc/xpra/xorg.conf -> build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/xpra (0o644)
chmod(build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/xpra/xorg.conf, 0o644)
copying fs/etc/xpra/xorg-uinput.conf -> build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/xpra (0o644)
chmod(build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/xpra/xorg-uinput.conf, 0o644)
creating build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/X11
creating build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/X11/xorg.conf.d
copying fs/etc/X11/xorg.conf.d/90-xpra-virtual.conf -> build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/X11/xorg.conf.d/ (0o644)
chmod(build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/X11/xorg.conf.d/90-xpra-virtual.conf, 0o644)
creating build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/pam.d
copying fs/etc/pam.d/xpra -> build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/pam.d (0o644)
chmod(build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/pam.d/xpra, 0o644)
creating build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/default
copying fs/etc/sysconfig/xpra -> build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/default (0o644)
chmod(build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/default/xpra, 0o644)
creating build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/init.d
copying fs/etc/init.d/xpra -> build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/init.d (0o644)
chmod(build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/init.d/xpra, 0o644)
creating build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/dbus-1
creating build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/dbus-1/system.d
copying fs/etc/dbus-1/system.d/xpra.conf -> build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/dbus-1/system.d (0o644)
chmod(build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/etc/dbus-1/system.d/xpra.conf, 0o644)
./docs               -> build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/share/doc/xpra
./docs/Build         -> build/bdist.linux-x86_64/wheel/xpra-4.1.3.data/data/share/doc/xpra/Build
  MacOS.md             -> MacOS.html
error: [Errno 2] No such file or directory: 'pandoc'

@bbjubjub2494 bbjubjub2494 marked this pull request as ready for review May 6, 2021 09:01
@r-rmcgibbo
Copy link

r-rmcgibbo commented May 6, 2021 •
edited

Result of nixpkgs-review pr 121893 at 5220d4e5 run on x86_64-linux 1

1 package failed to build:
2 packages built successfully:
  • run-scaled
  • xpra
6 suggestions:
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/X11/xpra/default.nix:18:7:

       |
18 |       ./0005-support-for-30-bit-depth-in-dummy-driver.patch
   |       ^
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/X11/xpra/default.nix:16:7:

       |
16 |       ./0002-Constant-DPI.patch
   |       ^
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/X11/xpra/default.nix:41:5:

       |
41 |     (substituteAll {
   |     ^
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/X11/xpra/default.nix:17:7:

       |
17 |       ./0003-fix-pointer-limits.patch
   |       ^
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/X11/xpra/default.nix:46:5:

       |
46 |     ./fix-41106.patch
   |     ^
  • warning: unused-argument

    Unused argument: callPackage.
    Near pkgs/tools/X11/xpra/default.nix:1:18:

      |
1 | { lib, fetchurl, callPackage, substituteAll, python3, pkg-config, writeText
  |                  ^

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement.

Result of nixpkgs-review pr 121893 at 1a014de7 run on aarch64-linux 1

1 package failed to build:
2 packages built successfully:
  • run-scaled
  • xpra
4 suggestions:
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/X11/xpra/default.nix:18:7:

       |
18 |       ./0005-support-for-30-bit-depth-in-dummy-driver.patch
   |       ^
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/X11/xpra/default.nix:16:7:

       |
16 |       ./0002-Constant-DPI.patch
   |       ^
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/X11/xpra/default.nix:17:7:

       |
17 |       ./0003-fix-pointer-limits.patch
   |       ^
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/X11/xpra/default.nix:46:5:

       |
46 |     ./fix-41106.patch  # https://github.com/NixOS/nixpkgs/issues/41106
   |     ^

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement.

@bbjubjub2494
Copy link
Member Author

@numinit could you briefly comment on the purpose of the 3 xf86videodummy patches? I'm not familiar enough with this code.

@numinit
Copy link
Contributor

numinit commented May 7, 2021

@lourkeur There are xpra DPI scaling issues with a bunch of applications without these...

@numinit
Copy link
Contributor

numinit commented May 7, 2021

@lourkeur Two of them are documented at https://github.com/Xpra-org/xpra/blob/master/docs/Usage/Xdummy.md

@bbjubjub2494 bbjubjub2494 requested a review from prusnak May 11, 2021 09:40
@numinit numinit self-requested a review May 16, 2021 22:22
@numinit
Copy link
Contributor

numinit commented May 16, 2021

@lourkeur Thanks for documenting those patches!

@SuperSandro2000 SuperSandro2000 merged commit f30367b into NixOS:master May 16, 2021
@zhaofengli
Copy link
Member

@lourkeur This broke xpra for me. When I do xpra start :10, I get the following in xpra logs:

(EE)
Fatal server error:
(EE) Unrecognized option:

(EE)
(EE)
Please consult the The X.Org Foundation support
         at http://wiki.x.org
 for help.
(EE)
2021-05-19 14:20:48,026
2021-05-19 14:20:48,026 Xvfb command has terminated! xpra cannot continue
2021-05-19 14:20:48,026  if the display is already running, try a different one,
2021-05-19 14:20:48,026  or use the --use-display flag
2021-05-19 14:20:48,026  full command: /nix/store/x5gi8j2gx7qn61za1lh5nhw23m1ir554-xorg-server-1.20.11/bin/Xorg \
    -noreset -novtswitch -nolisten tcp +extension GLX \
    +extension RANDR +extension RENDER -auth $XAUTHORITY \
    -logfile ${XPRA_LOG_DIR}/Xorg.${DISPLAY}.log \
    -configdir ${XDG_RUNTIME_DIR}/xpra/xorg.conf.d/$PID \
    -config \
    /nix/store/w9b9gjyp4d0yj6i9s15lrg74cgp2r438-xpra-4.1.3/etc/xpra/xorg.conf
2021-05-19 14:20:48,026

The reason seems to be that the entire argument string with line breaks is passed in as a single argument to Xorg.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@numinit numinit numinit approved these changes

@prusnak prusnak Awaiting requested review from prusnak

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
5 participants
@bbjubjub2494 @r-rmcgibbo @numinit @zhaofengli @SuperSandro2000