From c685f0536fa2c041527be681eb93800c8afbde77 Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Wed, 5 Aug 2020 05:41:20 -0400 Subject: [PATCH] gui-wm/wayfire: version bump to 0.5.0 Closes: https://bugs.gentoo.org/728880 Closes: https://bugs.gentoo.org/728504 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Aisha Tammy Signed-off-by: Aaron Bauman --- gui-wm/wayfire/Manifest | 1 + gui-wm/wayfire/wayfire-0.5.0.ebuild | 92 +++++++++++++++++++++++++++++ gui-wm/wayfire/wayfire-9999.ebuild | 26 ++++---- 3 files changed, 106 insertions(+), 13 deletions(-) create mode 100644 gui-wm/wayfire/wayfire-0.5.0.ebuild diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index f03e463761b8f..cbc0a80a9bcf5 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1 +1,2 @@ DIST wayfire-0.4.0.tar.xz 588904 BLAKE2B b720297b3ffb868761ea61615b4d0fefc2687f8a2060208f8cc002ff7adaf7622da906ad98e25664c3e72c04de2fb74741d0a417cce4826483407bdf10d63b43 SHA512 e96cdb90ce36c005476e08608683983aa167e58aea80fcfd3b24ab0836ec4aa50fb5a7eeb0872a1b1014e3073ed826e1c83d3146b39d3cdb2a8b3a0895155649 +DIST wayfire-0.5.0.tar.xz 670680 BLAKE2B 6a1555669352dd1303f7472db4fbb8ada6173c09825f4e999a2862787bd5bf31e070e9e12110249b9407d8c380235f4a9d3c5be6b23defe36094822526eed6ef SHA512 9c2d116a5d6e77e37b0e4eef26624d43d6ab3a80e56e19a2de1fdd28a2a522c24b9e346eb4529848f3b2c3668460a51f428a0c196286ec8300e4823250eae811 diff --git a/gui-wm/wayfire/wayfire-0.5.0.ebuild b/gui-wm/wayfire/wayfire-0.5.0.ebuild new file mode 100644 index 0000000000000..f2df4accbaa35 --- /dev/null +++ b/gui-wm/wayfire/wayfire-0.5.0.ebuild @@ -0,0 +1,92 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +DESCRIPTION="compiz like 3D wayland compositor" +HOMEPAGE="https://github.com/WayfireWM/wayfire" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git" +else + SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="+gles +system-wfconfig +system-wlroots elogind systemd X" +REQUIRED_USE="?? ( elogind systemd )" + +DEPEND=" + dev-libs/libevdev + dev-libs/libinput + gui-libs/gtk-layer-shell + media-libs/glm + media-libs/mesa:=[gles2,wayland,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/pixman + gles? ( media-libs/libglvnd[X?] ) + system-wfconfig? ( >=gui-libs/wf-config-${PV} ) + !system-wfconfig? ( !gui-libs/wf-config ) + system-wlroots? ( >=gui-libs/wlroots-0.11.0[elogind=,systemd=,X?] ) + !system-wlroots? ( !gui-libs/wlroots ) +" + +RDEPEND=" + ${DEPEND} + elogind? ( sys-auth/elogind ) + systemd? ( sys-apps/systemd ) + x11-misc/xkeyboard-config +" + +BDEPEND=" + dev-libs/wayland-protocols + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + $(meson_feature system-wfconfig use_system_wfconfig) + $(meson_feature system-wlroots use_system_wlroots) + $(meson_feature X xwayland) + $(meson_use gles enable_gles32) + ) + meson_src_configure +} + +src_install() { + default + meson_src_install + einstalldocs + + insinto "/usr/share/wayland-sessions/" + insopts -m644 + doins wayfire.desktop + + dodoc wayfire.ini + + if ! use systemd && ! use elogind; then + fowners root:0 /usr/bin/wayfire + fperms 4511 /usr/bin/wayfire + fi +} + +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 "To install the file execute" + elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${PF}/wayfire.ini.bz2 > ~/.config/wayfire.ini" + fi +} diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild index 3a3d136e62b0a..f2df4accbaa35 100644 --- a/gui-wm/wayfire/wayfire-9999.ebuild +++ b/gui-wm/wayfire/wayfire-9999.ebuild @@ -18,7 +18,7 @@ fi LICENSE="MIT" SLOT="0" -IUSE="+gles +system-wfconfig +system-wlroots elogind systemd" +IUSE="+gles +system-wfconfig +system-wlroots elogind systemd X" REQUIRED_USE="?? ( elogind systemd )" DEPEND=" @@ -26,19 +26,19 @@ DEPEND=" dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm - media-libs/mesa:=[gles2,wayland,X] + media-libs/mesa:=[gles2,wayland,X?] media-libs/libjpeg-turbo media-libs/libpng - media-libs/freetype:=[X] + media-libs/freetype:=[X?] x11-libs/libdrm - x11-libs/gtk+:3=[wayland,X] - x11-libs/cairo:=[X,svg] - x11-libs/libxkbcommon:=[X] + x11-libs/gtk+:3=[wayland,X?] + x11-libs/cairo:=[X?,svg] + X? ( x11-libs/libxkbcommon:=[X] ) x11-libs/pixman - gles? ( media-libs/libglvnd[X] ) - system-wfconfig? ( ~gui-libs/wf-config-${PV} ) + gles? ( media-libs/libglvnd[X?] ) + system-wfconfig? ( >=gui-libs/wf-config-${PV} ) !system-wfconfig? ( !gui-libs/wf-config ) - system-wlroots? ( ~gui-libs/wlroots-9999[elogind=,systemd=,X] ) + system-wlroots? ( >=gui-libs/wlroots-0.11.0[elogind=,systemd=,X?] ) !system-wlroots? ( !gui-libs/wlroots ) " @@ -50,15 +50,15 @@ RDEPEND=" " BDEPEND=" - ${DEPEND} + dev-libs/wayland-protocols virtual/pkgconfig - >=dev-libs/wayland-protocols-1.18 " src_configure() { local emesonargs=( $(meson_feature system-wfconfig use_system_wfconfig) $(meson_feature system-wlroots use_system_wlroots) + $(meson_feature X xwayland) $(meson_use gles enable_gles32) ) meson_src_configure @@ -85,8 +85,8 @@ 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/${P}/wayfire.ini.bz2\"" + elog "file is installed at \"/usr/share/doc/${PF}/wayfire.ini.bz2\"" elog "To install the file execute" - elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${P}/wayfire.ini.bz2 > ~/.config/wayfire.ini" + elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${PF}/wayfire.ini.bz2 > ~/.config/wayfire.ini" fi }