From 8bad3b236bbfcdc8df48da2fc167cd42b0ded30a Mon Sep 17 00:00:00 2001 From: David McKinney Date: Sun, 14 Apr 2019 09:59:01 -0400 Subject: [PATCH] Update to sway 1.0, added sgflow, removed rofi/sgmenu --- .../packagegroups/packagegroup-sway.bb | 4 +- meta-citadel/recipes-sway/rofi/rofi_1.5.0.bb | 18 ---- .../recipes-sway/sgflow/sgflow_git.bb | 22 +++++ .../recipes-sway/sgmenu/sgmenu_0.1.0.bb | 89 ------------------- meta-citadel/recipes-sway/sway/files/config | 16 +--- meta-citadel/recipes-sway/sway/sway_0.15.2.bb | 32 ------- .../recipes-sway/sway/sway_1.0-alpha.4.bb | 25 ------ .../sway/{sway_1.0-beta.1.bb => sway_git.bb} | 17 ++-- .../recipes-sway/swaylock/swaylock_1.3.bb | 15 ++++ .../{wlroots_git.bb => wlroots_0.5.0.bb} | 14 +-- 10 files changed, 57 insertions(+), 195 deletions(-) delete mode 100644 meta-citadel/recipes-sway/rofi/rofi_1.5.0.bb create mode 100644 meta-citadel/recipes-sway/sgflow/sgflow_git.bb delete mode 100644 meta-citadel/recipes-sway/sgmenu/sgmenu_0.1.0.bb delete mode 100644 meta-citadel/recipes-sway/sway/sway_0.15.2.bb delete mode 100644 meta-citadel/recipes-sway/sway/sway_1.0-alpha.4.bb rename meta-citadel/recipes-sway/sway/{sway_1.0-beta.1.bb => sway_git.bb} (70%) create mode 100644 meta-citadel/recipes-sway/swaylock/swaylock_1.3.bb rename meta-citadel/recipes-sway/wlroots/{wlroots_git.bb => wlroots_0.5.0.bb} (50%) diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb index 94333c9..3ff43f9 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb @@ -2,12 +2,12 @@ inherit packagegroup RDEPENDS_${PN} = "\ - sgmenu \ sgstatus \ wlroots \ sway \ xcb-util-xrm \ - rofi \ + sgflow \ + swaylock \ grim \ slurp \ polkit-gnome \ diff --git a/meta-citadel/recipes-sway/rofi/rofi_1.5.0.bb b/meta-citadel/recipes-sway/rofi/rofi_1.5.0.bb deleted file mode 100644 index 1a97246..0000000 --- a/meta-citadel/recipes-sway/rofi/rofi_1.5.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -# Recipe created by recipetool -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=e326af0896de95c64d15bde1a2704cd1" - -SRC_URI = "https://github.com/DaveDavenport/rofi/releases/download/${PV}/rofi-${PV}.tar.gz" -SRC_URI[md5sum] = "a60fa45011dc2803533ba7a5dca4c5b6" -SRC_URI[sha256sum] = "541de71ffe115951aeb3abe732c99d579f7a8711908e2768accf58e030470640" - -DEPENDS = "cairo pango libcheck librsvg flex-native startup-notification bison-native glib-2.0-native libxkbcommon xcb-util xcb-util-wm xcb-util-image xcb-util-xrm" - -# NOTE: if this software is not capable of being built in a separate build directory -# from the source, you should replace autotools with autotools-brokensep in the -# inherit line -inherit pkgconfig autotools - -# Specify any options you want to pass to the configure script using EXTRA_OECONF: -EXTRA_OECONF += "--enable-drun" - diff --git a/meta-citadel/recipes-sway/sgflow/sgflow_git.bb b/meta-citadel/recipes-sway/sgflow/sgflow_git.bb new file mode 100644 index 0000000..9fd2597 --- /dev/null +++ b/meta-citadel/recipes-sway/sgflow/sgflow_git.bb @@ -0,0 +1,22 @@ + +inherit meson pkgconfig + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f0ae30b1ae6ac2aff356f848cfe6bd04" + +SRC_URI = "gitsm://github.com/subgraph/sgflow \ + " +PV = "0.1.0+git${SRCPV}" +PR = "r0" + +UPSTREAM_CHECK_COMMITS = "1" + +SRCREV = "3a2d4a70f09a3cee6d345ed7fbb17696576a0e4c" + +S = "${WORKDIR}/git" + +#DEPENDS = "libx11 libdrm dbus libxcb xcb-util-wm xcb-util-image virtual/egl mesa wayland wayland-native libxkbcommon libinput systemd pixman" + +DEPENDS = "wlroots gtk+3 glib-2.0-native wayland-native" + + diff --git a/meta-citadel/recipes-sway/sgmenu/sgmenu_0.1.0.bb b/meta-citadel/recipes-sway/sgmenu/sgmenu_0.1.0.bb deleted file mode 100644 index d82f8ab..0000000 --- a/meta-citadel/recipes-sway/sgmenu/sgmenu_0.1.0.bb +++ /dev/null @@ -1,89 +0,0 @@ -# Auto-Generated by cargo-bitbake 0.3.10 -# -inherit cargo - -# If this is git based prefer versioned ones if they exist -# DEFAULT_PREFERENCE = "-1" - -# how to get sgmenu could be as easy as but default to a git checkout: -# SRC_URI += "crate://crates.io/sgmenu/0.1.0" -SRC_URI += "git://github.com/subgraph/sgmenu;protocol=https" -SRCREV = "00a379f414095946a5ccad177d609df8f8cf05cc" -S = "${WORKDIR}/git" -CARGO_SRC_DIR="" -PV_append = ".AUTOINC+00a379f414" - -# please note if you have entries that do not begin with crate:// -# you must change them to how that package can be fetched -SRC_URI += " \ -crate://crates.io/aho-corasick/0.6.4 \ -crate://crates.io/atty/0.2.8 \ -crate://crates.io/bitflags/1.0.1 \ -crate://crates.io/c_vec/1.2.1 \ -crate://crates.io/cairo-rs/0.3.0 \ -crate://crates.io/cairo-sys-rs/0.5.0 \ -crate://crates.io/cfg-if/0.1.2 \ -crate://crates.io/env_logger/0.5.5 \ -crate://crates.io/errno/0.1.8 \ -crate://crates.io/gdk-pixbuf-sys/0.5.0 \ -crate://crates.io/gdk-pixbuf/0.3.0 \ -crate://crates.io/gdk-sys/0.5.0 \ -crate://crates.io/gdk/0.7.0 \ -crate://crates.io/getopts/0.2.17 \ -crate://crates.io/gio-sys/0.5.0 \ -crate://crates.io/gio/0.3.0 \ -crate://crates.io/glib-sys/0.5.0 \ -crate://crates.io/glib/0.4.1 \ -crate://crates.io/gobject-sys/0.5.0 \ -crate://crates.io/humantime/1.1.1 \ -crate://crates.io/kernel32-sys/0.2.2 \ -crate://crates.io/lazy_static/1.0.0 \ -crate://crates.io/libc/0.2.36 \ -crate://crates.io/log/0.4.1 \ -crate://crates.io/memchr/2.0.1 \ -crate://crates.io/pango-sys/0.5.0 \ -crate://crates.io/pango/0.3.0 \ -crate://crates.io/pkg-config/0.3.9 \ -crate://crates.io/pty/0.2.2 \ -crate://crates.io/quick-error/1.2.1 \ -crate://crates.io/redox_syscall/0.1.37 \ -crate://crates.io/redox_termios/0.1.1 \ -crate://crates.io/regex-syntax/0.5.0 \ -crate://crates.io/regex/0.2.7 \ -crate://crates.io/termcolor/0.3.5 \ -crate://crates.io/termion/1.5.1 \ -crate://crates.io/thread_local/0.3.5 \ -crate://crates.io/ucd-util/0.1.1 \ -crate://crates.io/unreachable/1.0.0 \ -crate://crates.io/utf8-ranges/1.0.0 \ -crate://crates.io/void/1.0.2 \ -crate://crates.io/winapi-build/0.1.1 \ -crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ -crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ -crate://crates.io/winapi/0.2.8 \ -crate://crates.io/winapi/0.3.4 \ -crate://crates.io/wincolor/0.1.6 \ -" - - - -LIC_FILES_CHKSUM=" \ -" - -SUMMARY = "sgmenu" -HOMEPAGE = "https://github.com/subgraph/sgmenu" -LICENSE = "CLOSED" - -DEPENDS += " glib-2.0-native cairo pango gdk-pixbuf gtk+3" - -do_install() { - install -d ${D}${bindir} - - install -m 755 ${B}/target/${CARGO_TARGET_SUBDIR}/sgmenu ${D}${bindir} -} - -# includes this file if it exists but does not fail -# this is useful for anything you may want to override from -# what cargo-bitbake generates. -include sgmenu-${PV}.inc -include sgmenu.inc diff --git a/meta-citadel/recipes-sway/sway/files/config b/meta-citadel/recipes-sway/sway/files/config index e38efa3..2ca2059 100644 --- a/meta-citadel/recipes-sway/sway/files/config +++ b/meta-citadel/recipes-sway/sway/files/config @@ -16,15 +16,15 @@ set $up k set $right l # Your preferred terminal emulator - script command to appease pty requirement of machinectl -set $term /usr/bin/sgmenu -c '/usr/bin/realms run -- gnome-terminal' +set $term /usr/libexec/citadel-run gnome-terminal set $citadelterm gnome-terminal -set $filemanager /usr/bin/sgmenu -c '/usr/bin/realms run -- nautilus' +set $filemanager /usr/libexec/citadel-run nautilus set $lockscreen swaylock --scaling=fill -i /usr/share/backgrounds/gnome/adwaita-morning.jpg -set $screenshot grim /home/citadel/`date +'%Y-%m-%d-%H%M%S_screenshot.png'` +set $screenshot grim /storage/realms/Shared/`date +'%Y-%m-%d-%H%M%S_screenshot.png'` set $screenshot_region slurp | grim -g - /home/citadel/`date +'%Y-%m-%d-%H%M%S_screenshot.png'` # Your preferred application launcher -set $menu /usr/bin/sgmenu -d +set $menu /usr/bin/sgflow ### Output configuration # @@ -68,7 +68,6 @@ bindsym $mod+Shift+q kill # start your launcher bindsym $mod+d exec $menu -bindsym $mod+Shift+d exec $sgmenu # lock screen bindsym $mod+9 exec $lockscreen @@ -89,12 +88,6 @@ bindsym $mod+Shift+Print exec $screenshot_region # mouse button for dragging. floating_modifier $mod normal -# reload the configuration file -bindsym $mod+Shift+c reload - -# exit sway (logs you out of your wayland session) -bindsym $mod+Shift+e exit - # # Moving around: # @@ -173,7 +166,6 @@ bindsym $mod+a focus parent # # Rules: # -for_window [class="Rofi"] floating enable # Scratchpad: # diff --git a/meta-citadel/recipes-sway/sway/sway_0.15.2.bb b/meta-citadel/recipes-sway/sway/sway_0.15.2.bb deleted file mode 100644 index 052e50a..0000000 --- a/meta-citadel/recipes-sway/sway/sway_0.15.2.bb +++ /dev/null @@ -1,32 +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. -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] = "b89e6ea3a786eacac825a91ff4545491" -SRC_URI[sha256sum] = "05526e3038d2a5490a64bd816f1f04d2a6c214ddc6182835312b273b40b737ae" - -DEPENDS = "dbus cairo pango wlc libinput libxkbcommon wayland wayland-native libpam libcap json-c libpcre gdk-pixbuf" - -inherit cmake - -FILES_${PN} += "\ - ${datadir}/wayland-sessions/sway.desktop \ -" - -do_install_append() { - rm ${D}${sysconfdir}/sway/config - install -m 644 ${WORKDIR}/config ${D}${sysconfdir}/sway/config -} - -# Specify any options you want to pass to cmake using EXTRA_OECMAKE: -EXTRA_OECMAKE += "-Ddefault-wallpaper=no -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_SYSCONFDIR=/etc" - 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 deleted file mode 100644 index 9cb5368..0000000 --- a/meta-citadel/recipes-sway/sway/sway_1.0-alpha.4.bb +++ /dev/null @@ -1,25 +0,0 @@ -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/sway/sway_1.0-beta.1.bb b/meta-citadel/recipes-sway/sway/sway_git.bb similarity index 70% rename from meta-citadel/recipes-sway/sway/sway_1.0-beta.1.bb rename to meta-citadel/recipes-sway/sway/sway_git.bb index 911b1dd..9667413 100644 --- a/meta-citadel/recipes-sway/sway/sway_1.0-beta.1.bb +++ b/meta-citadel/recipes-sway/sway/sway_git.bb @@ -1,17 +1,21 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=dfc67e5b1fa10ebb4b70eb0c0ca67bea" -SRC_URI = "https://github.com/swaywm/sway/archive/${PV}.tar.gz \ - file://config \ - " +SRCREV = "bcde298a719f60b9913133dbd2a169dedbc8dd7d" -SRC_URI[md5sum] = "680ed07c0ce401af645a99e42ea459be" -SRC_URI[sha256sum] = "382955b9373219b2be6e2899a9f204383fe7ab9808ee28e56735b431bfbd81e2" +PV = "1.0+git${SRCPV}" -DEPENDS = "dbus cairo pango wlroots libinput libxkbcommon wayland wayland-native libpam libcap json-c libpcre gdk-pixbuf" +S = "${WORKDIR}/git" +SRC_URI = "gitsm://github.com/swaywm/sway \ + file://config \ + " + +UPSTREAM_CHECK_COMMITS = "1" inherit meson +DEPENDS = "dbus cairo pango wlroots libinput libxkbcommon wayland wayland-native libpam libcap json-c libpcre gdk-pixbuf" + FILES_${PN} += "\ ${datadir}/wayland-sessions/sway.desktop \ " @@ -23,3 +27,4 @@ do_install_append() { EXTRA_OEMESON += "-Ddefault-wallpaper=false -Dzsh-completions=false -Dbash-completions=false -Dfish-completions=false" + diff --git a/meta-citadel/recipes-sway/swaylock/swaylock_1.3.bb b/meta-citadel/recipes-sway/swaylock/swaylock_1.3.bb new file mode 100644 index 0000000..3e0160c --- /dev/null +++ b/meta-citadel/recipes-sway/swaylock/swaylock_1.3.bb @@ -0,0 +1,15 @@ +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b53d9ec16b9125995437ac9efab1b450" + +SRC_URI = "https://github.com/swaywm/swaylock/archive/${PV}.tar.gz \ + " + +SRC_URI[md5sum] = "60bb92e6ae639daef955f157e6128efe" +SRC_URI[sha256sum] = "3bf4143136e688af2f31d10c0be26d14e371f31bfceec1d98db88abfe0f7a94c" + +DEPENDS = "wlroots libxkbcommon wayland wayland-native libpam gdk-pixbuf cairo" + +inherit meson + +EXTRA_OEMESON += "-Dbash-completions=false -Dfish-completions=false -Dzsh-completions=false" + diff --git a/meta-citadel/recipes-sway/wlroots/wlroots_git.bb b/meta-citadel/recipes-sway/wlroots/wlroots_0.5.0.bb similarity index 50% rename from meta-citadel/recipes-sway/wlroots/wlroots_git.bb rename to meta-citadel/recipes-sway/wlroots/wlroots_0.5.0.bb index 7412ed1..697d680 100644 --- a/meta-citadel/recipes-sway/wlroots/wlroots_git.bb +++ b/meta-citadel/recipes-sway/wlroots/wlroots_0.5.0.bb @@ -1,21 +1,13 @@ inherit meson pkgconfig - LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818" -SRC_URI = "gitsm://github.com/swaywm/wlroots \ - file://0001-Reverting-meson-version-to-match-what-we-use.patch \ +SRC_URI = "https://github.com/swaywm/wlroots/archive/${PV}.tar.gz \ " -PV = "0.1.0+git${SRCPV}" -PR = "r0" - -UPSTREAM_CHECK_COMMITS = "1" - -SRCREV = "be6210cf8216c08a91e085dac0ec11d0e34fb217" - -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "d186d57cd7aeca3d8af10e2d88575875" +SRC_URI[sha256sum] = "3c6d422aaa7ac09a1e4a88d93f07a4d6ef6c5e4d76c3422c240a5783265ed0e3" DEPENDS = "libx11 libdrm dbus libxcb xcb-util-wm xcb-util-image virtual/egl mesa wayland wayland-native libxkbcommon libinput systemd pixman"