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
Various fixes for dev-libs/{sway{idle,lock,},wlroots} & version bump to sway-1.0_rc2 #11017
Conversation
701781a
to
43218e0
Compare
Hard to tell via the diff, but latest version and 9999 should be the same (unless 9999 had changes not in latest version), this lets us copy 9999 to the new release when it comes for easy bumps. |
I think swayidle needs swayidle -w before-sleep 'swaylock'
Failed to send Inhibit signal: Permission denied |
yep, remerged systemd and reloaded systemd-logind and now it works. elogind probably needs the same. |
- Update copyright header in all versions; - Use ${PN} wherever possible; - Remove explicit dependency on meson (no longer required); - Fix the order of (R)DEPEND; - wayland-protocols is a build-time dependency: move it in BDEPEND; - Add xcb-util-image dependency (required); - Remove `xkb` flag from libxcb dep (not required for >=wlroots-0.2). Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Niccolò Scatena <speedjack95@gmail.com>
43218e0
to
b0614f3
Compare
Done.
With
I've removed older versions of sway and wlroots except the last 2 versions of each: this would allow a user to fallback to the older version if something breaks in the latest.
Sway's tray feature now depends on systemd/elogind (see
The only difference between 28c28
< >=dev-libs/wlroots-0.3[elogind=,systemd=,X=]
---
> ~dev-libs/wlroots-9999[elogind=,systemd=,X=] While |
If we want to have wlroots-9999 for sway-9999 then we should probably lock it behind a if VER string like is done in other places. the other changes sound good and I'll review it fully some time today. |
I'll also add sway 1.0-rc2 (released 4h ago) to this PR later today. |
ok, I've updated to that locally already (using the rc1 ebuild, deps didn't change it looks like). |
b0614f3
to
50c9fbd
Compare
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.
I think all of this looks ok (I have not verified 9999 and latest version are the same, but I think they are and it'll be verified before push). The main question I have is if you've verified the depend/rdepend changes. I have a feeling removing stuff from rdepend could break stuff (once the depends are removed from the system on depclean). use lddtree
and the like to check linking (and runtime deps).
50c9fbd
to
12a3a1b
Compare
I've checked. deps seems fine. I see nothing that can break. |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Niccolò Scatena <speedjack95@gmail.com>
6b283a2
to
c85b083
Compare
Sway's wiki The PR should be ok now. |
it looks like they want to switch to setuid
|
well, we have 3 choices:
Currently we are on (2), since |
option 4, force setuid when !systemd and !elogind this is a security issue |
but for now leave it as it until upstream decides what to do |
c85b083
to
5d43be5
Compare
- Use ${PN} wherever possible; - Remove bash-completion use flag: bash completions should be always installed (see [1]); - Remove clipboard use flag and related dep: makes no sense to add this here, if the user wants to add utilities to handle the clipboard under wayland it is just and emerge away; wl-clipboard has nothing to do with sway; - Rename use flag: doc -> man (doc is a global use flag used to install additional documentation that most users does not want); - The sway tray feature (enabled by the tray use flag) now requires a logind provider: reflect this in REQUIRED_USE (fixes #677748); - Fix order of (R)DEPEND; - Remove required use gdk-pixbuf[jpeg]: the jpeg use flag is not required to be enabled. If the user wants support for JPEG images, he can manually enable it in gdk-pixbuf (as for other img formats); - Remove libcap dep: the fcaps eclass automatically adds it if filecaps use flag is enabled; - Dependency dbus is no longer required with tray (now uses sd-bus from logind): remove anything related to it; - Move scdoc and wayland-protocols dependencies to BDEPEND; - Add dep on xkeyboard-config: see bug #674640; - Add man-pages parameter to meson (fixes bug #677654); - Disable swaybar man page installation when swaybar use flag is disabled; - Use $MY_PV in sway-version arg to meson to reflect upstream version in sway --version; - Add a reminder to set XDG_RUNTIME_DIR if it's not set by the environment. This is needed in systems without logind/consolekit. [1] www.gentoo.org/support/news-items/2014-11-25-bash-completion-2_1-r90.html Closes: https://bugs.gentoo.org/672590 Closes: https://bugs.gentoo.org/675978 Closes: https://bugs.gentoo.org/674640 Closes: https://bugs.gentoo.org/677654 Closes: https://bugs.gentoo.org/677748 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Niccolò Scatena <speedjack95@gmail.com>
Closes: https://bugs.gentoo.org/677774 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Niccolò Scatena <speedjack95@gmail.com>
Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Niccolò Scatena <speedjack95@gmail.com>
Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Niccolò Scatena <speedjack95@gmail.com>
5d43be5
to
6bcc71c
Compare
Upstream suggests to use only setuid: swaywm/sway#3668 |
Copyright policy changePlease note that on 2018-09-15 Trustees have approved new Gentoo copyright policy. All contributions made to Gentoo need to follow this policy. If you include the Signed-off-by line in your commit message, you indicate that you have read the policy and agree to its terms. For more detailed explanation, please see the new Gentoo copyright policy explained article. Pull Request assignmentSubmitter: @SpeedJack dev-libs/sway: @flappyports, @prometheanfire, @Hummer12007, @SpeedJack Linked bugsBugs linked: 675978, 672590, 677774, 674640, 677748, 677654 In order to force reassignment and/or bug reference scan, please append Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide |
This has been merged. We can continue to address the setuid and fcaps in future updates. |
Pull request CI reportReport generated at: 2019-02-13 00:23 UTC No issues found |
@prometheanfire @flappyports
This merges the changes introduced by Matthew and those made in the old PR #10932 .
Changes are described in commit messages. Apparently, these are a lot. But these are mainly minor edits to make all ebuilds in the same format (reorder of
(R)DEPEND/HOMEPAGE/DESCRIPTION
; alphabetical order for use flags; etc.); Other are fixes to minor bugs (wayland-protocols
andscdoc
in BDEPEND; add missingxkeyboard-config
dep; etc.); Some are choices, that may be argueable (wl-clipboard
removed from dependency list;swaybar & swaybg
use flags against only one flaggdk-pixbuf
;doc
->man
renaming; etc.).Regarding bug #677522, I tried building every version (except the live version) of Sway without git and it works for me.
Matthew said that he opened a thread on gentoo-dev to ask for a new category
wayland-misc
or something like. I hope it will be approved - but if not, I would consider movingdev-libs/{sway{lock,idle},wl-clipboard}
toapp-misc
, which is a better category.