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

deepin.dde-kwin: init at 5.0.0 #71614

Merged
merged 5 commits into from
Oct 29, 2019
Merged

deepin.dde-kwin: init at 5.0.0 #71614

merged 5 commits into from
Oct 29, 2019
+213 −265

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

Add dde-kwin https://github.com/linuxdeepin/dde-kwin.

Other than packaging this, we need to update deepin to its latest revisions.
Which appears to be a bit of a difficult task, because I cannot find where recent changes are documented. i.e I think some other things were deprecated as well. Probably just have to attempt to update and see what breaks.

Things done

It builds, I don't think any other testing can be done until deepin packages are updated.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.

Sorry, something went wrong.

@worldofpeace worldofpeace requested a review from romildo October 22, 2019 03:40
@ofborg ofborg bot added 8.has: clean-up 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Oct 22, 2019
@romildo
Copy link
Contributor

romildo commented Oct 22, 2019

Building locally is failing due to a dependence (qt5dxcb-plugin) that fails to build:

[...]
cp: missing destination file operand after 'platformplugin/libqt5xcbqpa-dev/5.12.5/'
Try 'cp --help' for more information.
note: keeping build directory '/tmp/nix-build-qt5dxcb-plugin-5.0.1.drv-1'
builder for '/nix/store/76m40p6jdi9bi89p7lnyrarwdjjmiaiv-qt5dxcb-plugin-5.0.1.drv' failed with exit code 1
cannot build derivation '/nix/store/aapb9g8s7309h1pky72myssgi0aly7g2-qt5integration-0.3.12.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/mf5k4njhg4a316g37fkkki491pgvn8jl-dde-kwin-5.0.0.drv': 1 dependencies couldn't be built
error: build of '/nix/store/mf5k4njhg4a316g37fkkki491pgvn8jl-dde-kwin-5.0.0.drv' failed

@worldofpeace
deepin.deepin-wm: remove

Verified

This commit was signed with the committer’s verified signature. The key has expired.
dtzWill Will Dietz
GPG key ID: EBB0EA4124809D02
Expired
Verified
Learn about vigilant mode
05ebf34 
Upstream has deprecated this package. And it's currently broken.
@worldofpeace
deepin.deepin-metacity: remove
a18702f 
Also obsolete.
@worldofpeace
deepin.deepin-mutter: remove
d797361 
Also obsolete.
@worldofpeace
deepin.dde-kwin: init at 5.0.0
69e90bd
@worldofpeace
Copy link
Contributor Author

worldofpeace commented Oct 22, 2019 •
edited
Loading

@romildo You must have rebased this PR onto a older revision, that's fixed in c2eed8b. ofborg seems to have succeeded in building it.

Edit: qtbase was updated, thanks for catching the typo #71667

@romildo
Copy link
Contributor

romildo commented Oct 22, 2019 •
edited
Loading

The installed file $out/lib/pkgconfig/dde-kwin.pc contains the line below where the prefix is repeated:

libdir=/nix/store/zgfgfak1sp8ahc87r9qs9qmwgd65yiqf-dde-kwin-5.0.0//nix/store/zgfgfak1sp8ahc87r9qs9qmwgd65yiqf-dde-kwin-5.0.0/lib

Edited: It also has a hard coded path:

Libs.private: -L/usr/X11R6/lib64 -lQt5X11Extras -lKF5WindowSystem -lQt5Widgets -lQt5Gui -lKF5ConfigCore -lKF5CoreAddons -lQt5Core -lGL -lpthread

@worldofpeace
Copy link
Contributor Author

@romildo Do you have any idea what -L/usr/X11R6/lib64 is supposed to be?

perhaps the X11R6 is a debianism?

@romildo
Copy link
Contributor

romildo commented Oct 22, 2019

@romildo Do you have any idea what -L/usr/X11R6/lib64 is supposed to be?

perhaps the X11R6 is a debianism?

Probably it refers to the location where X11 libraries used to be installed some years ago. As far as I known it is not used anymore and can be ignored. It does not exist in none of my linux installations, including Deepin Linux, Ubuntu, Archlinux, and Fedora.

See the section The /usr/X11R6 directory in https://wiki.debian.org/Xorg69To7

@worldofpeace
Copy link
Contributor Author

@romildo Do you have any idea what -L/usr/X11R6/lib64 is supposed to be?

perhaps the X11R6 is a debianism?

Probably it refers to the location where X11 libraries used to be installed some years ago. As far as I known it is not used anymore and can be ignored. It does not exist in none of my linux installations, including Deepin Linux, Ubuntu, Archlinux, and Fedora.

See the section The /usr/X11R6 directory in https://wiki.debian.org/Xorg69To7

I've removed it from the file at install. Also opened a PR to correct the .pc linuxdeepin/dde-kwin#105 further.

@ofborg ofborg bot requested a review from romildo October 22, 2019 21:58
romildo
romildo approved these changes Oct 22, 2019
View reviewed changes
Copy link
Contributor

@romildo romildo left a comment

Choose a reason for hiding this comment

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

LGTM

@worldofpeace worldofpeace merged commit 03ad61c into NixOS:master Oct 29, 2019
@worldofpeace worldofpeace deleted the deepin-kwin branch October 29, 2019 00:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@romildo romildo

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@worldofpeace @romildo