From 0bd35c4ba1c33e2ad60854c6cf2639749cddf81e Mon Sep 17 00:00:00 2001 From: David McKinney Date: Thu, 19 Jul 2018 18:34:59 -0400 Subject: [PATCH] Updated Sway to wlroots-based 1.0-alpha.4 release, added compatible screenshotting tools (grim/slurp) --- .../packagegroups/packagegroup-sway.bb | 5 ++- meta-citadel/recipes-sway/grim/grim_git.bb | 22 +++++++++++ meta-citadel/recipes-sway/slurp/slurp_git.bb | 19 +++++++++ meta-citadel/recipes-sway/sway/files/config | 9 +++-- .../recipes-sway/sway/sway_1.0-alpha.4.bb | 25 ++++++++++++ meta-citadel/recipes-sway/wlc/wlc_git.bb | 39 ------------------- .../recipes-sway/wlroots/wlroots_git.bb | 20 ++++++++++ 7 files changed, 95 insertions(+), 44 deletions(-) create mode 100644 meta-citadel/recipes-sway/grim/grim_git.bb create mode 100644 meta-citadel/recipes-sway/slurp/slurp_git.bb create mode 100644 meta-citadel/recipes-sway/sway/sway_1.0-alpha.4.bb delete mode 100644 meta-citadel/recipes-sway/wlc/wlc_git.bb create mode 100644 meta-citadel/recipes-sway/wlroots/wlroots_git.bb diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb index 4d88b9c..b21cf6e 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb @@ -4,8 +4,11 @@ inherit packagegroup RDEPENDS_${PN} = "\ sgmenu \ sgstatus \ - wlc \ + wlroots \ sway \ xcb-util-xrm \ rofi \ + grim \ + slurp \ " + diff --git a/meta-citadel/recipes-sway/grim/grim_git.bb b/meta-citadel/recipes-sway/grim/grim_git.bb new file mode 100644 index 0000000..2480081 --- /dev/null +++ b/meta-citadel/recipes-sway/grim/grim_git.bb @@ -0,0 +1,22 @@ + +inherit meson pkgconfig + +SRC_URI[md5sum] = "faea394d9c496510096a04fe5430582c" +SRC_URI[sha256sum] = "c58ec15558debbb33e3390250e38375bc80b2275c8e902680424f7837bffabb3" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e316e9609dd7672b87ff25b46b2cf3e1" + +SRC_URI = "gitsm://github.com/emersion/grim" +PV = "0.1+git${SRCPV}" +PR = "r0" + +UPSTREAM_CHECK_COMMITS = "1" + +SRCREV = "caf66bc67fb0c9206aac486b9fe3074c77b07cc4" + +S = "${WORKDIR}/git" + +DEPENDS = "wayland wayland-native wayland-protocols cairo" + + diff --git a/meta-citadel/recipes-sway/slurp/slurp_git.bb b/meta-citadel/recipes-sway/slurp/slurp_git.bb new file mode 100644 index 0000000..d79ccce --- /dev/null +++ b/meta-citadel/recipes-sway/slurp/slurp_git.bb @@ -0,0 +1,19 @@ + +inherit meson pkgconfig + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e316e9609dd7672b87ff25b46b2cf3e1" + +SRC_URI = "gitsm://github.com/emersion/slurp" +PV = "0.1+git${SRCPV}" +PR = "r0" + +UPSTREAM_CHECK_COMMITS = "1" + +SRCREV = "a94273e02a5b70ca92dc67a08486198552583818" + +S = "${WORKDIR}/git" + +DEPENDS = "wayland wayland-native wayland-protocols cairo" + + diff --git a/meta-citadel/recipes-sway/sway/files/config b/meta-citadel/recipes-sway/sway/files/config index 38ca080..69fd63c 100644 --- a/meta-citadel/recipes-sway/sway/files/config +++ b/meta-citadel/recipes-sway/sway/files/config @@ -19,7 +19,7 @@ set $right l set $term /usr/bin/sgmenu -c '/usr/bin/realms run -- gnome-terminal' set $citadelterm gnome-terminal set $filemanager /usr/bin/sgmenu -c '/usr/bin/realms run -- nautilus' -set $lockscreen swaylock --scaling fill -i /usr/share/backgrounds/gnome/adwaita-morning.jpg +set $lockscreen swaylock --scaling=fill -i /usr/share/backgrounds/gnome/adwaita-morning.jpg # Your preferred application launcher set $menu /usr/bin/sgmenu -d @@ -239,9 +239,10 @@ bar { background #00000000 inactive_workspace #32323200 #32323200 #5c5c5c } - status_command /usr/libexec/sgstatus - - icon_theme Paper + # Disabling until tray works in Sway 1.0 + #status_command /usr/libexec/sgstatus + # Disabling until tray works in Sway 1.0 + #icon_theme Paper } include /etc/sway/config.d/* diff --git a/meta-citadel/recipes-sway/sway/sway_1.0-alpha.4.bb b/meta-citadel/recipes-sway/sway/sway_1.0-alpha.4.bb new file mode 100644 index 0000000..9cb5368 --- /dev/null +++ b/meta-citadel/recipes-sway/sway/sway_1.0-alpha.4.bb @@ -0,0 +1,25 @@ +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dfc67e5b1fa10ebb4b70eb0c0ca67bea" + +SRC_URI = "https://github.com/swaywm/sway/archive/${PV}.tar.gz \ + file://config \ + " + +SRC_URI[md5sum] = "1010dccf22236de3a353eaa938f5a2cf" +SRC_URI[sha256sum] = "c381ffc6a91037642e9d2205a9bfce3c4c120dfcc4d649d190e4ac7b74dcf166" + +DEPENDS = "dbus cairo pango wlroots libinput libxkbcommon wayland wayland-native libpam libcap json-c libpcre gdk-pixbuf" + +inherit meson + +FILES_${PN} += "\ + ${datadir}/wayland-sessions/sway.desktop \ +" + +do_install_append() { + rm ${D}${sysconfdir}/sway/config + install -m 644 ${WORKDIR}/config ${D}${sysconfdir}/sway/config +} + +EXTRA_OEMESON += "-Ddefault_wallpaper=false -Dzsh_completions=false" + diff --git a/meta-citadel/recipes-sway/wlc/wlc_git.bb b/meta-citadel/recipes-sway/wlc/wlc_git.bb deleted file mode 100644 index 06be62f..0000000 --- a/meta-citadel/recipes-sway/wlc/wlc_git.bb +++ /dev/null @@ -1,39 +0,0 @@ -# Recipe created by recipetool -# This is the basis of a recipe and may need further editing in order to be fully functional. -# (Feel free to remove these comments when editing.) - -# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is -# your responsibility to verify that the values are complete and correct. -# -# The following license files were not able to be identified and are -# represented as "Unknown" below, you will need to check them yourself: -# protos/wayland-protocols/COPYING -# lib/chck/LICENSE -# -# NOTE: multiple licenses have been detected; they have been separated with & -# in the LICENSE value for now since it is a reasonable assumption that all -# of the licenses apply. If instead there is a choice between the multiple -# licenses then you should change the value to separate the licenses with | -# instead of &. If there is any doubt, check the accompanying documentation -# to determine which situation is applicable. -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0424d0715413cefdd4fbd497e682a87c \ - file://protos/wayland-protocols/COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ - file://lib/chck/LICENSE;md5=8a56f5f1791f1100ec6d74f74bd847ca" - -SRC_URI = "gitsm://github.com/Cloudef/wlc" - -# Modify these as desired -PV = "1.0+git${SRCPV}" -SRCREV = "6542c16652df147523245fc547d2a5ff4088a0cb" - -S = "${WORKDIR}/git" - -# NOTE: unable to map the following CMake package dependencies: LibInput Math Elogind GBM WaylandProtocols GLESv2 Pixman Systemd Wayland XKBCommon Udev -DEPENDS = "libx11 libdrm dbus libxcb xcb-util-wm xcb-util-image virtual/egl mesa wayland wayland-native libxkbcommon libinput systemd pixman" - -inherit cmake - -# Specify any options you want to pass to cmake using EXTRA_OECMAKE: -EXTRA_OECMAKE = "" - diff --git a/meta-citadel/recipes-sway/wlroots/wlroots_git.bb b/meta-citadel/recipes-sway/wlroots/wlroots_git.bb new file mode 100644 index 0000000..cd4b0e6 --- /dev/null +++ b/meta-citadel/recipes-sway/wlroots/wlroots_git.bb @@ -0,0 +1,20 @@ + +inherit meson pkgconfig + + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818" + +SRC_URI = "gitsm://github.com/swaywm/wlroots" +PV = "0.1+git${SRCPV}" +PR = "r0" + +UPSTREAM_CHECK_COMMITS = "1" + +SRCREV = "2a58d4467f83c5660bbee6733a73cc1ed92ca478" + +S = "${WORKDIR}/git" + +DEPENDS = "libx11 libdrm dbus libxcb xcb-util-wm xcb-util-image virtual/egl mesa wayland wayland-native libxkbcommon libinput systemd pixman" + +