summaryrefslogtreecommitdiff
path: root/gui-wm
diff options
context:
space:
mode:
Diffstat (limited to 'gui-wm')
-rw-r--r--gui-wm/hikari/Manifest1
-rw-r--r--gui-wm/hikari/hikari-2.3.2.ebuild72
-rw-r--r--gui-wm/hikari/metadata.xml15
-rw-r--r--gui-wm/metadata.xml2
-rw-r--r--gui-wm/sway/Manifest1
-rw-r--r--gui-wm/sway/metadata.xml5
-rw-r--r--gui-wm/sway/sway-1.6.1-r1.ebuild (renamed from gui-wm/sway/sway-1.6.1.ebuild)14
-rw-r--r--gui-wm/sway/sway-1.6.ebuild115
-rw-r--r--gui-wm/sway/sway-9999.ebuild42
-rw-r--r--gui-wm/wayfire/Manifest2
-rw-r--r--gui-wm/wayfire/metadata.xml2
-rw-r--r--gui-wm/wayfire/wayfire-0.7.2.ebuild (renamed from gui-wm/wayfire/wayfire-0.7.1.ebuild)33
-rw-r--r--gui-wm/wayfire/wayfire-9999.ebuild11
13 files changed, 127 insertions, 188 deletions
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index aea90698300..f4f656fc45f 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1 +1,2 @@
DIST hikari-2.2.2.tar.gz 1019277 BLAKE2B 3cf76f0849cbc80493b6f078ec32b2a6f8e47f12ff3a015132e662dc2382f4071661126bf111550e5ab31eee69c54adaf10ec6ef64b681d7859771a180d30652 SHA512 53b1cb8b8e5fdbabcdcb5ba8af31f1cc66e89c8e94d217b7d1f89f0c733fb7969a251ef5090296b7aeca064aafc60d12878f3f2dbffa17e1fb24609e5549b4f1
+DIST hikari-2.3.2.tar.gz 1022093 BLAKE2B 8e4df4377728cc1feab3509588a9f2d5138af6e3175682672eedce4ca45d5bb9b7e56568a860871b319b3ff1213468f38f0b6253927f6ab4b905dd495c05c53e SHA512 b7485be089064dd19c4614f60066b3f7b2f322328fa771d4383db27656695746fb00ab534cc754929141c23b7556992391529e537e0522080177068f3d0e2954
diff --git a/gui-wm/hikari/hikari-2.3.2.ebuild b/gui-wm/hikari/hikari-2.3.2.ebuild
new file mode 100644
index 00000000000..119bd1fe8f0
--- /dev/null
+++ b/gui-wm/hikari/hikari-2.3.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing toolchain-funcs
+
+DESCRIPTION="Wayland compositor inspired by CWM"
+HOMEPAGE="https://hikari.acmelabs.space/"
+SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X suid"
+
+COMMON_DEPEND="
+ dev-libs/glib:2
+ dev-libs/libinput:=
+ dev-libs/libucl
+ dev-libs/wayland
+ gui-libs/wlroots:0/14[X?]
+ sys-libs/pam
+ x11-libs/cairo
+ x11-libs/libxkbcommon
+ x11-libs/pango
+ x11-libs/pixman"
+RDEPEND="
+ ${COMMON_DEPEND}
+ x11-misc/xkeyboard-config"
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-libs/wayland-protocols"
+BDEPEND="
+ dev-util/wayland-scanner
+ sys-devel/bmake
+ virtual/pkgconfig"
+
+src_compile() {
+ tc-export CC PKG_CONFIG
+
+ local bmake=(
+ bmake -j$(makeopts_jobs)
+ ETC_PREFIX="${EPREFIX}"
+ CFLAGS_EXTRA="${CFLAGS} ${CPPFLAGS}"
+ LDFLAGS_EXTRA="${LDFLAGS}"
+ VERSION=${PV}
+ -DWITH_GAMMACONTROL
+ -DWITH_LAYERSHELL
+ -DWITH_POSIX_C_SOURCE
+ -DWITH_SCREENCOPY
+ -DWITH_VIRTUAL_INPUT
+ $(usev X -DWITH_XWAYLAND)
+ )
+
+ # empty flags to avoid duplicates (some parts use only _EXTRA, others both)
+ echo "${bmake[*]}"
+ CFLAGS= LDFLAGS= "${bmake[@]}" || die
+}
+
+src_install() {
+ local bmake=(
+ bmake install
+ DESTDIR="${D}"
+ PREFIX="${EPREFIX}"/usr
+ ETC_PREFIX="${EPREFIX}"
+ $(usev suid -DWITH_SUID)
+ )
+
+ echo "${bmake[*]}"
+ "${bmake[@]}" || die
+}
diff --git a/gui-wm/hikari/metadata.xml b/gui-wm/hikari/metadata.xml
index dbb748db812..8446f7621df 100644
--- a/gui-wm/hikari/metadata.xml
+++ b/gui-wm/hikari/metadata.xml
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <longdescription>
- hikari is a minimalistic wayland window manager
- based on wlroots trying inspired by the simplicity
- of CWM in the X days. It aims stay out of your way
- and focus more on the task than the windows.
- </longdescription>
<maintainer type="person" proxied="yes">
<email>gentoo@aisha.cc</email>
<name>Aisha Tammy</name>
@@ -15,7 +9,14 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
+ <longdescription>
+ Hikari is a minimalistic wayland window manager
+ based on wlroots trying inspired by the simplicity
+ of CWM in the X days. It aims stay out of your way
+ and focus more on the task than the windows.
+ </longdescription>
<use>
+ <flag name="X">Enable support for X11 applications (XWayland)</flag>
<flag name="gamma">add gamma control for redshift</flag>
<flag name="layershell">add support for wayland apps using layer shell</flag>
<flag name="screencopy">add support for screen grabbing</flag>
diff --git a/gui-wm/metadata.xml b/gui-wm/metadata.xml
index 4d356cb3ba7..0a9936c600c 100644
--- a/gui-wm/metadata.xml
+++ b/gui-wm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
The gui-wm category contains various window managers.
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 2cb0bca5655..fd95879a6f9 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,2 +1 @@
DIST sway-1.6.1.tar.gz 5550126 BLAKE2B a4ecc93df0eb16fcd9037ce62dd39c63e1712b3bc9e8ae36331a815759b18576f4a2c1b78a26545922038974f226f02e2d91f78d6e3933125d9b808871b7a887 SHA512 7f37fea99970db42c5485277df06d69bef5225fa03d25be179893b14d73c1d681f0355a1bc74091b4173bbccc88994a63ad0f9322e070811ba963648cf68cdeb
-DIST sway-1.6.tar.gz 5549909 BLAKE2B ee0d7aad2fe8c57061e23e9b875ebb8e991e2fb30483dee6cf7d7faa3ec782a3f28676bf9fe2183c0e643b5ed744535eba07d7e5cf20ec0756c8e5407c0f34e2 SHA512 f62477aa4a20de99c41078c6866ec67d04d0d1824f4cb21a0c40213dbadf6394e31cd239b74376bf604d20d03ce047ba97f1728043568fd49fcef43f5101c750
diff --git a/gui-wm/sway/metadata.xml b/gui-wm/sway/metadata.xml
index c338aedaf70..0f236d0a69f 100644
--- a/gui-wm/sway/metadata.xml
+++ b/gui-wm/sway/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>bman@gentoo.org</email>
@@ -26,9 +26,6 @@
something else.
</longdescription>
<use>
- <flag name="elogind">Enable support for rootless session via elogind</flag>
- <flag name="fish-completion">Enable fish completion support</flag>
- <flag name="seatd">Enable support for rootless session via <pkg>sys-auth/seatd</pkg></flag>
<flag name="swaybar">Install 'swaybar': sway's status bar component</flag>
<flag name="swaybg">Install 'swaybg': allows to set a desktop background image</flag>
<flag name="swayidle">Install 'swayidle': idle manager to run commands when user is inactive</flag>
diff --git a/gui-wm/sway/sway-1.6.1.ebuild b/gui-wm/sway/sway-1.6.1-r1.ebuild
index 9bf7e960777..7373d695f64 100644
--- a/gui-wm/sway/sway-1.6.1.ebuild
+++ b/gui-wm/sway/sway-1.6.1-r1.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE="fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X zsh-completion"
+IUSE="+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X"
DEPEND="
>=dev-libs/json-c-0.13:0=
@@ -80,16 +80,16 @@ src_configure() {
-Dtray=$(usex tray enabled disabled)
-Dxwayland=$(usex X enabled disabled)
$(meson_use wallpapers default-wallpaper)
- $(meson_use fish-completion fish-completions)
- $(meson_use zsh-completion zsh-completions)
- "-Dbash-completions=true"
- "-Dwerror=false"
+ -Dfish-completions=true
+ -Dzsh-completions=true
+ -Dbash-completions=true
+ -Dwerror=false
)
if use swaybar; then
- emesonargs+=("-Dgdk-pixbuf=enabled")
+ emesonargs+=( -Dgdk-pixbuf=enabled )
else
- emesonargs+=("-Dgdk-pixbuf=disabled")
+ emesonargs+=( -Dgdk-pixbuf=disabled )
fi
meson_src_configure
diff --git a/gui-wm/sway/sway-1.6.ebuild b/gui-wm/sway/sway-1.6.ebuild
deleted file mode 100644
index 2cd639ebc15..00000000000
--- a/gui-wm/sway/sway-1.6.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="https://swaywm.org"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
- MY_PV=${PV/_rc/-rc}
- SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm64 ~ppc64 x86"
- S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion"
-REQUIRED_USE="?? ( elogind systemd )
- tray? ( || ( elogind seatd systemd ) )"
-
-DEPEND="
- >=dev-libs/json-c-0.13:0=
- >=dev-libs/libinput-1.6.0:0=
- dev-libs/libpcre
- dev-libs/wayland
- x11-libs/cairo
- x11-libs/libxkbcommon
- x11-libs/pango
- x11-libs/pixman
- media-libs/mesa[gles2,libglvnd(+)]
- elogind? ( >=sys-auth/elogind-239 )
- swaybar? ( x11-libs/gdk-pixbuf:2 )
- swaybg? ( gui-apps/swaybg )
- swayidle? ( gui-apps/swayidle )
- swaylock? ( gui-apps/swaylock )
- systemd? ( >=sys-apps/systemd-239[policykit] )
- wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
- X? ( x11-libs/libxcb:0= )
-"
-if [[ ${PV} == 9999 ]]; then
- DEPEND+="~gui-libs/wlroots-9999:=[elogind=,seatd=,systemd=,X=]"
-else
- DEPEND+="
- >=gui-libs/wlroots-0.13:=[elogind=,seatd=,systemd=,X=]
- <gui-libs/wlroots-0.14:=[elogind=,seatd=,systemd=,X=]
- "
-fi
-RDEPEND="
- x11-misc/xkeyboard-config
- ${DEPEND}
-"
-BDEPEND="
- >=dev-libs/wayland-protocols-1.14
- >=dev-util/meson-0.53.0
- virtual/pkgconfig
-"
-if [[ ${PV} == 9999 ]]; then
- BDEPEND+="man? ( ~app-text/scdoc-9999 )"
-else
- BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
-fi
-
-src_prepare() {
- default
-
- use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
- -e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
- use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
- -e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
- use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
- -e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- -Dman-pages=$(usex man enabled disabled)
- -Dtray=$(usex tray enabled disabled)
- -Dxwayland=$(usex X enabled disabled)
- $(meson_use wallpapers default-wallpaper)
- $(meson_use fish-completion fish-completions)
- $(meson_use zsh-completion zsh-completions)
- "-Dbash-completions=true"
- "-Dwerror=false"
- )
-
- if use swaybar; then
- emesonargs+=("-Dgdk-pixbuf=enabled")
- else
- emesonargs+=("-Dgdk-pixbuf=disabled")
- fi
-
- meson_src_configure
-}
-
-pkg_preinst() {
- if ! use systemd && ! use elogind && ! use seatd; then
- fowners root:0 /usr/bin/sway
- fperms 4511 /usr/bin/sway
- fi
-}
-
-pkg_postinst() {
- if ! use systemd && ! use elogind && ! use seatd; then
- elog ""
- elog "If your system does not set the XDG_RUNTIME_DIR environment"
- elog "variable, you must set it manually to run Sway. See wiki"
- elog "for details: https://wiki.gentoo.org/wiki/Sway"
- fi
-}
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index c6a53ff0d87..799f71a6a9d 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE="fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X zsh-completion"
+IUSE="+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X"
DEPEND="
>=dev-libs/json-c-0.13:0=
@@ -44,8 +44,8 @@ if [[ ${PV} == 9999 ]]; then
DEPEND+="~gui-libs/wlroots-9999:=[X=]"
else
DEPEND+="
- >=gui-libs/wlroots-0.14:=[X=]
- <gui-libs/wlroots-0.15:=[X=]
+ >=gui-libs/wlroots-0.15:=[X=]
+ <gui-libs/wlroots-0.16:=[X=]
"
fi
RDEPEND="
@@ -54,7 +54,7 @@ RDEPEND="
"
BDEPEND="
>=dev-libs/wayland-protocols-1.14
- >=dev-util/meson-0.53.0
+ >=dev-util/meson-0.59.0
virtual/pkgconfig
"
if [[ ${PV} == 9999 ]]; then
@@ -63,34 +63,20 @@ else
BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
fi
-src_prepare() {
- default
-
- use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
- -e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
- use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
- -e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
- use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
- -e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
-}
-
src_configure() {
local emesonargs=(
- -Dman-pages=$(usex man enabled disabled)
- -Dtray=$(usex tray enabled disabled)
- -Dxwayland=$(usex X enabled disabled)
+ $(meson_feature man man-pages)
+ $(meson_feature tray)
+ $(meson_feature X xwayland)
+ $(meson_feature swaybar gdk-pixbuf)
+ $(meson_use swaynag)
+ $(meson_use swaybar)
$(meson_use wallpapers default-wallpaper)
- $(meson_use fish-completion fish-completions)
- $(meson_use zsh-completion zsh-completions)
- "-Dbash-completions=true"
- "-Dwerror=false"
+ -Dfish-completions=true
+ -Dzsh-completions=true
+ -Dbash-completions=true
+ -Dwerror=false
)
- if use swaybar; then
- emesonargs+=("-Dgdk-pixbuf=enabled")
- else
- emesonargs+=("-Dgdk-pixbuf=disabled")
- fi
-
meson_src_configure
}
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 5454f153084..c664604cabb 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1 +1 @@
-DIST wayfire-0.7.1.tar.xz 753104 BLAKE2B e26b5e770fff44ef04a9d832ed404f05d37448c8ecc0be1e976b8bd0866c2716150bc43394fc4d2fbba1854696eaf54f16dabc632b686f236e66313d0d1eaf59 SHA512 c045ed16d2eb24b508f84d6616021638ec139b99618f5cb834f2b3675d1e549a6cc1bc3150dd97965a16a2a23fe54abe34e4671ce345350a7fb4084f13d7e969
+DIST wayfire-0.7.2.tar.xz 753132 BLAKE2B 0873ff9937cdc7cc63af2c2c365c7e3eed9c0784ab0777e88de9aa373316e9bb1c87a10651d8526577e3da32e402e4d8f6db68d32bc4fcf5513f526751f76829 SHA512 e1321605dbae2b9769a54aaacb0e4a4259b1e2ab4304e8a8c1257f7033b2d740b0632053309ecccc75e04f7b6d2bdf6d68dcebad6950fd914c3052b19bc58e24
diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml
index ebb88ce3d36..bc435a800ec 100644
--- a/gui-wm/wayfire/metadata.xml
+++ b/gui-wm/wayfire/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<longdescription>
compiz like eye-candy 3D wayland, with low memory footprint.
diff --git a/gui-wm/wayfire/wayfire-0.7.1.ebuild b/gui-wm/wayfire/wayfire-0.7.2.ebuild
index 10e6172e29c..eca2999b571 100644
--- a/gui-wm/wayfire/wayfire-0.7.1.ebuild
+++ b/gui-wm/wayfire/wayfire-0.7.2.ebuild
@@ -13,13 +13,12 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
else
SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~riscv ~x86"
fi
LICENSE="MIT"
SLOT="0"
-IUSE="+gles +system-wfconfig +system-wlroots elogind systemd X"
-REQUIRED_USE="?? ( elogind systemd )"
+IUSE="+gles +system-wfconfig +system-wlroots X"
DEPEND="
dev-libs/libevdev
@@ -27,31 +26,33 @@ DEPEND="
gui-libs/gtk-layer-shell
media-libs/glm
media-libs/mesa:=[gles2,wayland,X?]
+ media-libs/libglvnd[X?]
media-libs/libjpeg-turbo
media-libs/libpng
media-libs/freetype:=[X?]
x11-libs/libdrm
x11-libs/gtk+:3=[wayland,X?]
x11-libs/cairo:=[X?,svg]
- X? ( x11-libs/libxkbcommon:=[X] )
+ x11-libs/libxkbcommon:=[X?]
x11-libs/pixman
- gles? ( media-libs/libglvnd[X?] )
+ X? (
+ x11-base/xwayland
+ x11-libs/libxcb
+ )
system-wfconfig? (
>=gui-libs/wf-config-0.7.1
<gui-libs/wf-config-0.8.0
)
!system-wfconfig? ( !gui-libs/wf-config )
system-wlroots? (
- >=gui-libs/wlroots-0.13.0:=[elogind=,systemd=,X?]
- <gui-libs/wlroots-0.14.0:=
+ >=gui-libs/wlroots-0.14.0:=[X?]
+ <gui-libs/wlroots-0.15.0:=
)
!system-wlroots? ( !gui-libs/wlroots )
"
RDEPEND="
${DEPEND}
- elogind? ( sys-auth/elogind )
- systemd? ( sys-apps/systemd )
x11-misc/xkeyboard-config
"
@@ -75,30 +76,24 @@ src_configure() {
}
src_install() {
- default
meson_src_install
dobin "${T}"/wayfire-session
- einstalldocs
insinto "/usr/share/wayland-sessions/"
insopts -m644
doins wayfire.desktop
doins "${T}"/wayfire-session.desktop
- dodoc wayfire.ini
-
- if ! use systemd && ! use elogind; then
- fowners root:0 /usr/bin/wayfire
- fperms 4511 /usr/bin/wayfire
- fi
+ insinto "/usr/share/wayfire/"
+ doins wayfire.ini
}
pkg_postinst() {
if [ -z "${REPLACING_VERSIONS}" ]; then
elog "Wayfire has been installed but the session cannot be used"
elog "until you install a configuration file. The default config"
- elog "file is installed at \"/usr/share/doc/${PF}/wayfire.ini.bz2\""
+ elog "file is installed at \"/usr/share/wayfire/wayfire.ini\""
elog "To install the file execute"
- elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${PF}/wayfire.ini.bz2 > ~/.config/wayfire.ini"
+ elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini"
fi
}
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index ed76917f7d8..8c86b4aadda 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
else
SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
fi
LICENSE="MIT"
@@ -35,7 +35,10 @@ DEPEND="
x11-libs/cairo:=[X?,svg]
x11-libs/libxkbcommon:=[X?]
x11-libs/pixman
- X? ( x11-libs/libxcb )
+ X? (
+ x11-libs/libxcb
+ x11-base/xwayland
+ )
system-wfconfig? ( ~gui-libs/wf-config-9999:= )
!system-wfconfig? ( !gui-libs/wf-config )
system-wlroots? ( ~gui-libs/wlroots-9999:=[X?] )
@@ -54,9 +57,9 @@ BDEPEND="
src_configure() {
sed -e "s:@EPREFIX@:${EPREFIX}:" \
- "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
+ "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
sed -e "s:@EPREFIX@:${EPREFIX}:" \
- "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
+ "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
local emesonargs=(
$(meson_feature system-wfconfig use_system_wfconfig)
$(meson_feature system-wlroots use_system_wlroots)