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

sway: update to 1.9. #48916

Merged
merged 2 commits into from
Mar 21, 2024
Merged

Conversation

AnInternetTroll
Copy link
Contributor

  • sway: update to 1.9.
  • grimshot: update to 1.9+0

Testing the changes

  • I tested the changes in this PR: YES

Local build testing

  • I built this PR locally for my native architecture, (x86_64-glibc)

@caughtquick
Copy link
Contributor

Sway uses wmenu as its default menu, and without it the default sway configuration is very hard to use (launch everything from terminal). Should wmenu be added as a dependency?

@AnInternetTroll
Copy link
Contributor Author

AnInternetTroll commented Feb 26, 2024 via email

@rationalize-zz
Copy link

I am of the opinion that there should not be any additional dependencies added, for the following reasons:

  • From a commit history perspective, the current merged version of Sway includes dmenu in the example config but does not count dmenu as a dependency. This is also true of the Foot terminal emulator.
  • From a consistency perspective, the example sway config calls Foot as the terminal emulator. If dmenu/wmenu become dependencies by nature of being included the example config, consistency would also require including Foot as a dependency. My opinion is that it would be better to not include any of these as dependencies.
  • From a design intention perspective, a WM is not a DE. WM should not become opinionated at a package level about which packages are "official" components of the WM. An alternative here would be to create some sort of "Sway-DE" meta-package if it is decided that a "works fresh out of the box" experience is wanted for this WM.

@caughtquick
Copy link
Contributor

I definitely agree with the points made by @rationalize-zz, I use fuzzel and would have no use for the wmenu package, however it just doesn't sit right to me to have package ship in a "broken state", with errors in the config file by default just when run. Maybe just comment those parts of the config out?

@@ -0,0 +1,19 @@
# Template file for 'grimshot'
pkgname=grimshot
version=1.9+0
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
version=1.9+0
version=1.9+contrib.0

license="MIT"
homepage="https://github.com/OctopusET/sway-contrib/"
changelog="https://github.com/OctopusET/sway-contrib/releases/"
distfiles="https://github.com/OctopusET/sway-contrib/archive/refs/tags/${version%+*}-contrib.${version#*+}.tar.gz"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
distfiles="https://github.com/OctopusET/sway-contrib/archive/refs/tags/${version%+*}-contrib.${version#*+}.tar.gz"
distfiles="https://github.com/OctopusET/sway-contrib/archive/refs/tags/${version/+/-}.tar.gz"

@ahesford
Copy link
Member

ahesford commented Mar 1, 2024

Do not add things like wmenu to depends. Users are expected to understand how to configure and use the packages they install. Sway will operate just fine without optional depenendencies like a menu or terminal emulator, whether or not the default (example) configuration specifies them. This might be a good application for optional dependencies in XBPS but, because XBPS does not support the concept, we don't hard-require optionals just so things work "out of the box".

@AnInternetTroll AnInternetTroll force-pushed the user/luca/sway branch 2 times, most recently from cd10fde to 8f4dc24 Compare March 1, 2024 19:11
@AnInternetTroll
Copy link
Contributor Author

AnInternetTroll commented Mar 1, 2024 via email

@zdykstra
Copy link
Contributor

Is there anything left on this PR? Does it need more end-user testing?

@ahesford
Copy link
Member

I think the consensus on IRC was to reject my suggest for 1.9+contrib.0 in favor of the original 1.9+0, which would require the distfiles substitution ${version/+/-contrib.}.

@AnInternetTroll
Copy link
Contributor Author

AnInternetTroll commented Mar 21, 2024 via email

@ahesford ahesford merged commit bee8c9a into void-linux:master Mar 21, 2024
8 checks passed
@AnInternetTroll AnInternetTroll deleted the user/luca/sway branch July 11, 2024 10:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants