From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- gui-wm/wayfire/Manifest | 10 +-- gui-wm/wayfire/files/wayfire-session | 17 +++++ gui-wm/wayfire/files/wayfire-session.desktop | 7 ++ gui-wm/wayfire/wayfire-0.4.0-r2.ebuild | 92 -------------------------- gui-wm/wayfire/wayfire-0.5.0.ebuild | 2 +- gui-wm/wayfire/wayfire-0.6.0.ebuild | 98 ++++++++++++++++++++++++++++ gui-wm/wayfire/wayfire-9999.ebuild | 10 ++- 7 files changed, 137 insertions(+), 99 deletions(-) create mode 100644 gui-wm/wayfire/files/wayfire-session create mode 100644 gui-wm/wayfire/files/wayfire-session.desktop delete mode 100644 gui-wm/wayfire/wayfire-0.4.0-r2.ebuild create mode 100644 gui-wm/wayfire/wayfire-0.6.0.ebuild (limited to 'gui-wm/wayfire') diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index 5ddbc71b41be..45247ee3dca8 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1,6 +1,8 @@ -DIST wayfire-0.4.0.tar.xz 588904 BLAKE2B b720297b3ffb868761ea61615b4d0fefc2687f8a2060208f8cc002ff7adaf7622da906ad98e25664c3e72c04de2fb74741d0a417cce4826483407bdf10d63b43 SHA512 e96cdb90ce36c005476e08608683983aa167e58aea80fcfd3b24ab0836ec4aa50fb5a7eeb0872a1b1014e3073ed826e1c83d3146b39d3cdb2a8b3a0895155649 +AUX wayfire-session 540 BLAKE2B 02970ebece43c8643ab68f0108d2166f7946d54cea7c6143c9badf0e9852bed4af14bb0c4dd3101a179958b06904889204915e965c46f64073fb8f05800553e3 SHA512 616bbf244a358fb7fbeb1230a3ba862a7ca373fdf3b181819a05ca63da82c78fcd80d0f7167d50488c38820559f007702d2c86ac861f214775c3a6271351bb1d +AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca6151866599c0a7d0ef5b17c2b88ff6178c6f6d42506f1d6f6cbce8f9231388fa63e2a870116a45c677bd9faee94eabfac SHA512 0c7fd2f04c5b2c413bda02f2c43090dc8c64503d372e8eb19df8a4d7190f6ba703db672753bfa0629a2f627b505886c33f874a933cc6cf7f876caf60a4e70039 DIST wayfire-0.5.0.tar.xz 670680 BLAKE2B 6a1555669352dd1303f7472db4fbb8ada6173c09825f4e999a2862787bd5bf31e070e9e12110249b9407d8c380235f4a9d3c5be6b23defe36094822526eed6ef SHA512 9c2d116a5d6e77e37b0e4eef26624d43d6ab3a80e56e19a2de1fdd28a2a522c24b9e346eb4529848f3b2c3668460a51f428a0c196286ec8300e4823250eae811 -EBUILD wayfire-0.4.0-r2.ebuild 2195 BLAKE2B 5efde918474d27f67fc4f92d5f8698cc37f3c0c7a51ce9ec18c3de83665fa389bedcd216b6a677324d772bc0aac4932836ff78a0aa23f29d6fcfdfe14ca19e85 SHA512 f2ff58e2db827ecdaac14d00cfefca63d7bcba311733bfa38ecf9f3cdff23c1a7bcd9f0ae21110ced8752056bb86fdd6907716d5955ff7a656c2abbd61415451 -EBUILD wayfire-0.5.0.ebuild 2225 BLAKE2B 9fc4d1d219b17bca7857084d3d02badad0528fa303124a95e4935a05faee34324aebb30d1a2ef4b39abb2c5072127d4a923c696cbee8ae8ef2b8555493951eb2 SHA512 a8b343a776d2a458acdbac07c6114bcfb20c83178c3e6c0ac68c430408d3a010c073563072b4a47f01ea4811630d6845ea174862e9156ba307e9bcb61f2fe8b5 -EBUILD wayfire-9999.ebuild 2225 BLAKE2B 9fc4d1d219b17bca7857084d3d02badad0528fa303124a95e4935a05faee34324aebb30d1a2ef4b39abb2c5072127d4a923c696cbee8ae8ef2b8555493951eb2 SHA512 a8b343a776d2a458acdbac07c6114bcfb20c83178c3e6c0ac68c430408d3a010c073563072b4a47f01ea4811630d6845ea174862e9156ba307e9bcb61f2fe8b5 +DIST wayfire-0.6.0.tar.xz 701084 BLAKE2B 3ee0274c706aaa4690e9eb9617d2f272dd1e6573529c40b43d3fd05e79a4ddceef8dec34a7d2363aff8603fb3fd7490c4d2e79e67bff825a3bb68cc8090ad301 SHA512 dc6b5378dc51352ab41ac3c5713e73f341caa2a119a91826818b0a7cde629e63ce855a4376b5c60b468717336dda4806fb1195d534cd7ab2e5d6285c8075102e +EBUILD wayfire-0.5.0.ebuild 2224 BLAKE2B 8723cb41fa204ecdd6a5b95936ba385750f63eaa76fd56e837536b489a7a06e50e026a02f3875188df7be62e761a7252e27353c97165b97ab1972654807c35ff SHA512 08a13c4cf252e83e1010b7d7a4b98a4fc445d5f8b64801d146034dc830c8a1bf6efe6252c355d3aff5ea7a47cdbca43dc2235635a713ed94fa78dc8a468f5130 +EBUILD wayfire-0.6.0.ebuild 2518 BLAKE2B 5dacd5c710808d54720bd6eba5fd070019c866ddbced26afe61db360da9a17c70413a5fdbdfc96169c5be55d31aa72b8324c5a96483570b78035b1a7fa5c889b SHA512 19eb652df74b90bfafdfa0833cf4429a99ce023ddd315cd5078c567df4bd7d025106806519ba941264ead8893edff2ee7b0824b25ecd657ce7539cfc12899ab2 +EBUILD wayfire-9999.ebuild 2518 BLAKE2B 5dacd5c710808d54720bd6eba5fd070019c866ddbced26afe61db360da9a17c70413a5fdbdfc96169c5be55d31aa72b8324c5a96483570b78035b1a7fa5c889b SHA512 19eb652df74b90bfafdfa0833cf4429a99ce023ddd315cd5078c567df4bd7d025106806519ba941264ead8893edff2ee7b0824b25ecd657ce7539cfc12899ab2 MISC metadata.xml 1050 BLAKE2B 4404ae0b4151d021c94faae90c340bfd76cdfc3885c543dfccbb7ce55b47811eaf3066c47026f3767c8b9289612605798db167783e3e466bb383336802649877 SHA512 da70122b6ba9cda31537d7c14b9c2d8b7b6097808e3d07f3e15fdfc9f8e21c3d5db0bf7105dcbafe80c08b22e979f338a702b36a7cbd7f2cade4a2c005d0fadf diff --git a/gui-wm/wayfire/files/wayfire-session b/gui-wm/wayfire/files/wayfire-session new file mode 100644 index 000000000000..8267ea0e11fc --- /dev/null +++ b/gui-wm/wayfire/files/wayfire-session @@ -0,0 +1,17 @@ +#!/bin/bash + +# output to syslog and stderr +# with PID and syslog identity 'wayfire' +exec 1> >(logger --id=$$ --stderr --tag wayfire) 2>&1 + +# if undefined, or empty, set to freedesktop specification defaults +[ -z "$XDG_DATA_DIRS" ] && export XDG_DATA_DIRS="/usr/local/share:/usr/share" + +# freedesktop specifications mandate that the definition +# of XDG_SESSION_TYPE should be respected +export XDG_SESSION_TYPE=wayland +export GDK_BACKEND=wayland +export QT_QPA_PLATFORM=wayland +export MOZ_ENABLE_WAYLAND=1 + +exec @EPREFIX@/usr/bin/wayfire "$@" diff --git a/gui-wm/wayfire/files/wayfire-session.desktop b/gui-wm/wayfire/files/wayfire-session.desktop new file mode 100644 index 000000000000..1088c4e0b793 --- /dev/null +++ b/gui-wm/wayfire/files/wayfire-session.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Wayfire Session +Comment=wayfire session with proper env vars +Exec=@EPREFIX@/usr/bin/wayfire-session $* +TryExec=@EPREFIX@/usr/bin/wayfire-session +Type=Application +DesktopNames=Wayfire diff --git a/gui-wm/wayfire/wayfire-0.4.0-r2.ebuild b/gui-wm/wayfire/wayfire-0.4.0-r2.ebuild deleted file mode 100644 index bf539ba4965a..000000000000 --- a/gui-wm/wayfire/wayfire-0.4.0-r2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# 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" -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] - 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.10.1[elogind=,systemd=,X] ) - !system-wlroots? ( !gui-libs/wlroots ) -" - -RDEPEND=" - ${DEPEND} - elogind? ( sys-auth/elogind ) - systemd? ( sys-apps/systemd ) - x11-misc/xkeyboard-config -" - -BDEPEND=" - ${DEPEND} - 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_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/${P}/wayfire.ini.bz2\"" - elog "To install the file execute" - elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${P}/wayfire.ini.bz2 > ~/.config/wayfire.ini" - fi -} diff --git a/gui-wm/wayfire/wayfire-0.5.0.ebuild b/gui-wm/wayfire/wayfire-0.5.0.ebuild index f2df4accbaa3..5b1a4cb2d819 100644 --- a/gui-wm/wayfire/wayfire-0.5.0.ebuild +++ b/gui-wm/wayfire/wayfire-0.5.0.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/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 ~x86" fi LICENSE="MIT" diff --git a/gui-wm/wayfire/wayfire-0.6.0.ebuild b/gui-wm/wayfire/wayfire-0.6.0.ebuild new file mode 100644 index 000000000000..96f551ce51ca --- /dev/null +++ b/gui-wm/wayfire/wayfire-0.6.0.ebuild @@ -0,0 +1,98 @@ +# 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.12.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() { + sed -e "s:@EPREFIX@:${EPREFIX}:" \ + "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die + sed -e "s:@EPREFIX@:${EPREFIX}:" \ + "${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) + $(meson_feature X xwayland) + $(meson_use gles enable_gles32) + ) + meson_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 +} + +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 f2df4accbaa3..96f551ce51ca 100644 --- a/gui-wm/wayfire/wayfire-9999.ebuild +++ b/gui-wm/wayfire/wayfire-9999.ebuild @@ -36,9 +36,9 @@ DEPEND=" 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-${PV%.*} ) !system-wfconfig? ( !gui-libs/wf-config ) - system-wlroots? ( >=gui-libs/wlroots-0.11.0[elogind=,systemd=,X?] ) + system-wlroots? ( >=gui-libs/wlroots-0.12.0[elogind=,systemd=,X?] ) !system-wlroots? ( !gui-libs/wlroots ) " @@ -55,6 +55,10 @@ BDEPEND=" " src_configure() { + sed -e "s:@EPREFIX@:${EPREFIX}:" \ + "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die + sed -e "s:@EPREFIX@:${EPREFIX}:" \ + "${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) @@ -67,11 +71,13 @@ 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 -- cgit v1.2.3