[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/files/, gui-wm/wayfire/
commit: b4fac4c4ef737c2dcdce7a043860835b64d126b9 Author: Viorel Munteanu gentoo org> AuthorDate: Thu Jun 6 05:19:30 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Thu Jun 6 05:20:35 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4fac4c4 gui-wm/wayfire: drop 0.8.1-r1 Signed-off-by: Viorel Munteanu gentoo.org> gui-wm/wayfire/files/wayfire-session | 17 - gui-wm/wayfire/wayfire-0.8.1-r1.ebuild | 109 - 2 files changed, 126 deletions(-) diff --git a/gui-wm/wayfire/files/wayfire-session b/gui-wm/wayfire/files/wayfire-session deleted file mode 100644 index 8267ea0e11fc.. --- a/gui-wm/wayfire/files/wayfire-session +++ /dev/null @@ -1,17 +0,0 @@ -#!/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/wayfire-0.8.1-r1.ebuild b/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild deleted file mode 100644 index f3277a9f1614.. --- a/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -DESCRIPTION="compiz like 3D wayland compositor" -HOMEPAGE="https://github.com/WayfireWM/wayfire; - -if [[ ${PV} == ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git; - SLOT="0/0.8" -else - SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz; - KEYWORDS="amd64 ~arm64 ~riscv" - SLOT="0/$(ver_cut 1-2)" -fi - -LICENSE="MIT" -IUSE="+gles3 test X" -RESTRICT="!test? ( test )" - -# bundled wlroots has the following dependency string according to included headers. -# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?] -# enable x11-backend with X and vice versa -CDEPEND=" - dev-cpp/nlohmann_json - dev-libs/glib:2 - dev-libs/libevdev - >=dev-libs/libinput-1.7.0:= - dev-libs/wayland - >=dev-libs/wayland-protocols-1.12 - gui-libs/wf-config:${SLOT} - gui-libs/wlroots:0/17[drm(+),libinput(+),x11-backend,X?] - media-libs/glm - media-libs/libglvnd - media-libs/libjpeg-turbo:= - media-libs/libpng:= - x11-libs/cairo - x11-libs/libxkbcommon - x11-libs/pango - x11-libs/pixman - X? ( - x11-libs/libxcb:= - ) -" - -RDEPEND=" - ${CDEPEND} - x11-misc/xkeyboard-config -" -DEPEND=" - ${CDEPEND} - test? ( dev-cpp/doctest ) -" -BDEPEND=" - dev-util/wayland-scanner - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/wayfire-0.8.0-dont-use-installed-config-h.patch" -) - -src_prepare() { - default - - 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 -} - -src_configure() { - local emesonargs=( - $(meson_feature test tests) - $(meson_feature X xwayland) - $(meson_use gles3 enable_gles32) - -Duse_system_wfconfig=enabled - -Duse_system_wlroots=enabled - ) - - meson_src_configure -} - -src_install() { - meson_src_install - dobin "${T}"/wayfire-session - - insinto "/usr/share/wayland-sessions/" - insopts -m644 - doins wayfire.desktop - doins "${T}"/wayfire-session.desktop - - 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/wayfire/wayfire.ini\"" - elog "To install the file execute" - elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini" - fi -}
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: c855d46d6439ed8bb9ab49486bf4acccdcbf62eb Author: Arthur Zamarin gentoo org> AuthorDate: Wed Jun 5 07:00:16 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Jun 5 07:00:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c855d46d gui-wm/wayfire: Stabilize 0.8.1-r2 amd64, #933557 Signed-off-by: Arthur Zamarin gentoo.org> gui-wm/wayfire/wayfire-0.8.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild b/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild index ff1a84e65576..886e64833e05 100644 --- a/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild +++ b/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == ]]; then SLOT="0/0.8" else SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz; - KEYWORDS="~amd64 ~arm64 ~riscv" + KEYWORDS="amd64 ~arm64 ~riscv" SLOT="0/$(ver_cut 1-2)" fi
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 0dcacd70325103c5161fd5dd311450ed33bfc938 Author: Viorel Munteanu gentoo org> AuthorDate: Wed Jun 5 04:40:16 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Wed Jun 5 04:46:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dcacd70 gui-wm/wayfire: clean obsolete local use flags Signed-off-by: Viorel Munteanu gentoo.org> gui-wm/wayfire/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml index ed72465ca08f..6a9c1dd0a5aa 100644 --- a/gui-wm/wayfire/metadata.xml +++ b/gui-wm/wayfire/metadata.xml @@ -11,10 +11,7 @@ fisheye, wrot and all other desktop effects to wayland. - use libglvnd to do animations more efficiently Enable OpenGL ES 3.x Features. - Use the system-wide gui-libs/wf-config instead of building as a submodule. It will block system-wide gui-libs/wf-config from being installed. - Use the system-wide gui-libs/wlroots instead of building as a submodule. It will block system-wide gui-libs/wlroots from being installed. Enable support for X11 applications (XWayland).
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/files/
commit: e8babd467daa775132585e2cd4cc9751538e833e Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun May 26 08:52:40 2024 + Commit: Conrad Kostecki gentoo org> CommitDate: Sun May 26 21:29:10 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8babd46 gui-wm/wayfire: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> .../files/wayfire-0.8.0-fix-duplicate-manpage.patch | 21 - 1 file changed, 21 deletions(-) diff --git a/gui-wm/wayfire/files/wayfire-0.8.0-fix-duplicate-manpage.patch b/gui-wm/wayfire/files/wayfire-0.8.0-fix-duplicate-manpage.patch deleted file mode 100644 index 393de41d0ccb.. --- a/gui-wm/wayfire/files/wayfire-0.8.0-fix-duplicate-manpage.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugs.gentoo.org/922898 -https://github.com/WayfireWM/wayfire/issues/1942 -https://github.com/WayfireWM/wayfire/pull/1943 -https://github.com/WayfireWM/wayfire/commit/564b75a45d7c844b61b510e68fa527109fce4a75 - -From 564b75a45d7c844b61b510e68fa527109fce4a75 Mon Sep 17 00:00:00 2001 -From: alice -Date: Sat, 7 Oct 2023 22:51:35 +0200 -Subject: [PATCH] meson: fix duplicate installation of manpage (#1943) - -closes #1942 a/man/meson.build -+++ b/man/meson.build -@@ -1,7 +1,5 @@ - configure_file(input: 'wayfire.1.in', -output: 'wayfire.1', -- install: true, -- install_dir: 'man', -configuration: conf_data) - - install_man(join_paths(meson.project_build_root(), 'man', 'wayfire.1'))
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 0b4e584b00018890ee7446f25766d0ed8cb5ca89 Author: Matt Turner gentoo org> AuthorDate: Thu May 23 15:45:09 2024 + Commit: Matt Turner gentoo org> CommitDate: Thu May 23 16:09:58 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b4e584b gui-wm/wayfire: Drop old versions Signed-off-by: Matt Turner gentoo.org> gui-wm/wayfire/Manifest| 1 - gui-wm/wayfire/wayfire-0.8.0-r1.ebuild | 157 gui-wm/wayfire/wayfire-0.8.0-r2.ebuild | 158 - 3 files changed, 316 deletions(-) diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index 45e2431c82bb..d2482b440895 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1,2 +1 @@ -DIST wayfire-0.8.0.tar.xz 828576 BLAKE2B 4d80a0d43061a4564d45f7c077fd97737b426c4036c12f004815dbad120f51b38b2fac9a010e2df27a6a96205cd0dcceb81864bdccbd6e337d81f6c37926e019 SHA512 fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1dfdc8b1b898d998a9 DIST wayfire-0.8.1.tar.xz 856364 BLAKE2B 1b596b28878789ca26eeb57c6c24e0b69508731de2144e1477f8071b41f17757b2125f2f4f99670ca8b7f85172a9f641b9be1f9190eeff5b261bcc2df1bec4ab SHA512 7bce5656b6a7a7fe53b37492465dee3e591eb38fdd3d6876f4a589f059510fb2d0c0a326df260ca6a293edf4ba43bb55f813e85d4d2d38d6ef1319280254 diff --git a/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild b/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild deleted file mode 100644 index 4dd1a09a0f71.. --- a/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -DESCRIPTION="compiz like 3D wayland compositor" -HOMEPAGE="https://github.com/WayfireWM/wayfire; - -if [[ ${PV} == ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git; - SLOT="0/" -else - SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz; - KEYWORDS="amd64 ~arm64 ~riscv ~x86" - SLOT="0/$(ver_cut 1-2)" -fi - -LICENSE="MIT" -IUSE="+gles +system-wfconfig +system-wlroots test X" -RESTRICT="!test? ( test )" - -# bundled wlroots has the following dependency string according to included headers. -# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?] -# enable x11-backend with X and vice versa -WLROOTS_CDEPEND=" - >=dev-libs/libinput-1.14.0:= - >=dev-libs/wayland-1.21 - media-libs/libglvnd - media-libs/mesa[egl(+),gles2] - sys-apps/hwdata:= - sys-auth/seatd:= - >=x11-libs/libdrm-2.4.114:= - x11-libs/libxkbcommon - >=x11-libs/pixman-0.42.0 - virtual/libudev - X? ( - x11-base/xwayland - x11-libs/libxcb:0= - x11-libs/xcb-util-image - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) -" -WLROOTS_DEPEND=" - >=dev-libs/wayland-protocols-1.28 -" -WLROOTS_BDEPEND=" - dev-util/glslang - dev-util/wayland-scanner -" - -CDEPEND=" - dev-cpp/nlohmann_json - dev-libs/libevdev - >=dev-libs/libinput-1.7.0 - dev-libs/wayland - >=dev-libs/wayland-protocols-1.12 - media-libs/glm - media-libs/libglvnd - media-libs/libjpeg-turbo:= - media-libs/libpng:= - x11-libs/cairo - x11-libs/libdrm:= - x11-libs/libxkbcommon - x11-libs/pango - x11-libs/pixman - system-wfconfig? ( gui-libs/wf-config:${SLOT} ) - !system-wfconfig? ( dev-libs/libxml2 ) - !system-wlroots? ( ${WLROOTS_CDEPEND} ) -" - -if [[ ${PV} == ]] ; then - CDEPEND+=" - system-wlroots? ( gui-libs/wlroots:0/[drm(+),libinput(+),x11-backend,X?] ) - " -else - CDEPEND+=" - system-wlroots? ( gui-libs/wlroots:0/16[drm(+),libinput(+),x11-backend,X?] ) - " -fi - -RDEPEND=" - ${CDEPEND} - x11-misc/xkeyboard-config - !system-wfconfig? ( !gui-libs/wf-config ) - !system-wlroots? ( !gui-libs/wlroots ) -" -DEPEND=" - ${CDEPEND} - !system-wlroots? ( ${WLROOTS_DEPEND} ) - test? ( dev-cpp/doctest ) -" -BDEPEND=" - dev-util/wayland-scanner - virtual/pkgconfig - !system-wlroots? ( ${WLROOTS_BDEPEND} ) -" - -PATCHES=( - "${FILESDIR}/wayfire-0.8.0-fix-duplicate-manpage.patch" -) - -src_prepare() { - default - - 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 - - if [[ "${PV}" != ]]; then - # Don't run git if git is installed and its not a git dir - sed -i \ - -e "/git = find_program/ifs =
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 54d29f0c8fe0ed7b9270b1db95061a598b7c890b Author: Viorel Munteanu gentoo org> AuthorDate: Sun May 5 18:08:15 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Sun May 5 18:27:29 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d29f0c gui-wm/wayfire: sync live ebuild Signed-off-by: Viorel Munteanu gentoo.org> gui-wm/wayfire/wayfire-.ebuild | 23 --- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-.ebuild index 6a2f5696709d..bce466406ffd 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="MIT" -IUSE="+gles3 test X" +IUSE="+dbus +gles3 test X" RESTRICT="!test? ( test )" # bundled wlroots has the following dependency string according to included headers. @@ -42,9 +42,8 @@ CDEPEND=" x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman - X? ( - x11-libs/libxcb:= - ) + dbus? ( sys-apps/dbus ) + X? ( x11-libs/libxcb:= ) " RDEPEND=" @@ -63,8 +62,9 @@ BDEPEND=" src_prepare() { default - sed -e "s:@EPREFIX@:${EPREFIX}:" \ - "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die + local dbusrunsession=$(usev dbus dbus-run-session) + sed -e "s:@EPREFIX@:${EPREFIX}:g" -e "s:@DBUS_RUN_SESSION@:${dbusrunsession}:" \ + "${FILESDIR}"/wayfire-session-2 > "${T}"/wayfire-session || die sed -e "s:@EPREFIX@:${EPREFIX}:" \ "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die } @@ -92,14 +92,7 @@ src_install() { 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/wayfire/wayfire.ini\"" - elog "To install the file execute" - elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini" - fi + insinto "/etc" + doins "${FILESDIR}"/wayfire.env }
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/files/, gui-wm/wayfire/
commit: 57236d595649afbb6777e95809156a31e45b084b Author: Viorel Munteanu gentoo org> AuthorDate: Sun May 5 18:03:55 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Sun May 5 18:27:29 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57236d59 gui-wm/wayfire: resolve issues in wayfire-session Start dbus (add a USE flag for this). Add a config file to disable hardware cursor (invisible on nvidia). Initialize .ini file if absent (and remove the postinst message). It can be started from a tty or from sddm. Signed-off-by: Viorel Munteanu gentoo.org> gui-wm/wayfire/files/wayfire-session-2 | 26 + gui-wm/wayfire/files/wayfire.env | 2 + gui-wm/wayfire/wayfire-0.8.1-r2.ebuild | 102 + 3 files changed, 130 insertions(+) diff --git a/gui-wm/wayfire/files/wayfire-session-2 b/gui-wm/wayfire/files/wayfire-session-2 new file mode 100644 index ..0713ca0bbb93 --- /dev/null +++ b/gui-wm/wayfire/files/wayfire-session-2 @@ -0,0 +1,26 @@ +#!/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 + +# copy wayfire.ini to $HOME/.config/ if not already there +configdir="${XDG_CONFIG_HOME:=${HOME}/.config}" +if [[ ! -f ${configdir}/wayfire.ini ]]; then + cp /usr/share/wayfire/wayfire.ini "${configdir}" +fi + +# override or add environment variables +[[ -f @EPREFIX@/etc/wayfire.env ]] && . @EPREFIX@/etc/wayfire.env + +exec @DBUS_RUN_SESSION@ @EPREFIX@/usr/bin/wayfire "$@" diff --git a/gui-wm/wayfire/files/wayfire.env b/gui-wm/wayfire/files/wayfire.env new file mode 100644 index ..47ce61e3183c --- /dev/null +++ b/gui-wm/wayfire/files/wayfire.env @@ -0,0 +1,2 @@ +# Uncomment if the mouse cursor is invisible: +#export WLR_NO_HARDWARE_CURSORS=1 diff --git a/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild b/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild new file mode 100644 index ..ff1a84e65576 --- /dev/null +++ b/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild @@ -0,0 +1,102 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="compiz like 3D wayland compositor" +HOMEPAGE="https://github.com/WayfireWM/wayfire; + +if [[ ${PV} == ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git; + SLOT="0/0.8" +else + SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz; + KEYWORDS="~amd64 ~arm64 ~riscv" + SLOT="0/$(ver_cut 1-2)" +fi + +LICENSE="MIT" +IUSE="+dbus +gles3 test X" +RESTRICT="!test? ( test )" + +# bundled wlroots has the following dependency string according to included headers. +# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?] +# enable x11-backend with X and vice versa +CDEPEND=" + dev-cpp/nlohmann_json + dev-libs/glib:2 + dev-libs/libevdev + >=dev-libs/libinput-1.7.0:= + dev-libs/wayland + >=dev-libs/wayland-protocols-1.12 + gui-libs/wf-config:${SLOT} + gui-libs/wlroots:0/17[drm(+),libinput(+),x11-backend,X?] + media-libs/glm + media-libs/libglvnd + media-libs/libjpeg-turbo:= + media-libs/libpng:= + x11-libs/cairo + x11-libs/libxkbcommon + x11-libs/pango + x11-libs/pixman + dbus? ( sys-apps/dbus ) + X? ( x11-libs/libxcb:= ) +" + +RDEPEND=" + ${CDEPEND} + x11-misc/xkeyboard-config +" +DEPEND=" + ${CDEPEND} + test? ( dev-cpp/doctest ) +" +BDEPEND=" + dev-util/wayland-scanner + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/wayfire-0.8.0-dont-use-installed-config-h.patch" +) + +src_prepare() { + default + + local dbusrunsession=$(usev dbus dbus-run-session) + sed -e "s:@EPREFIX@:${EPREFIX}:g" -e "s:@DBUS_RUN_SESSION@:${dbusrunsession}:" \ + "${FILESDIR}"/wayfire-session-2 > "${T}"/wayfire-session || die + sed -e "s:@EPREFIX@:${EPREFIX}:" \ + "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die +} + +src_configure() { + local emesonargs=( + $(meson_feature test tests) + $(meson_feature X xwayland) + $(meson_use gles3 enable_gles32) + -Duse_system_wfconfig=enabled + -Duse_system_wlroots=enabled + ) + + meson_src_configure +} + +src_install() { + meson_src_install + dobin "${T}"/wayfire-session + + insinto
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 9a7715594577369be251649fabe4c90108cb2b17 Author: Viorel Munteanu gentoo org> AuthorDate: Sun May 5 18:08:06 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Sun May 5 18:27:29 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a771559 gui-wm/wayfire: add myself as a maintainer Co-maintainers welcome. Signed-off-by: Viorel Munteanu gentoo.org> gui-wm/wayfire/metadata.xml | 35 +++ 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml index fb1df8affac5..ed72465ca08f 100644 --- a/gui-wm/wayfire/metadata.xml +++ b/gui-wm/wayfire/metadata.xml @@ -1,20 +1,23 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - -compiz like eye-candy 3D wayland, with low memory footprint. -Aims to bring desktop features such as 3D cube, fire burn, -fisheye, wrot and all other desktop effects to wayland. - - -use libglvnd to do animations more efficiently -Enable OpenGL ES 3.x Features. -Use the system-wide gui-libs/wf-config instead of building as a submodule. It will block system-wide gui-libs/wf-config from being installed. -Use the system-wide gui-libs/wlroots instead of building as a submodule. It will block system-wide gui-libs/wlroots from being installed. -Enable support for X11 applications (XWayland). - - -WayfireWM/wayfire - + + cea...@gentoo.org + Viorel Munteanu + + + compiz like eye-candy 3D wayland, with low memory footprint. + Aims to bring desktop features such as 3D cube, fire burn, + fisheye, wrot and all other desktop effects to wayland. + + + use libglvnd to do animations more efficiently + Enable OpenGL ES 3.x Features. + Use the system-wide gui-libs/wf-config instead of building as a submodule. It will block system-wide gui-libs/wf-config from being installed. + Use the system-wide gui-libs/wlroots instead of building as a submodule. It will block system-wide gui-libs/wlroots from being installed. + Enable support for X11 applications (XWayland). + + + WayfireWM/wayfire +
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 949cae5cf2c3c0b6d40b355f85aedc70eb5e92d7 Author: Sam James gentoo org> AuthorDate: Wed Apr 24 14:41:16 2024 + Commit: Sam James gentoo org> CommitDate: Wed Apr 24 14:41:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949cae5c gui-wm/wayfire: Stabilize 0.8.1-r1 amd64, #930588 Signed-off-by: Sam James gentoo.org> gui-wm/wayfire/wayfire-0.8.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild b/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild index 82d800484181..f3277a9f1614 100644 --- a/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild +++ b/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == ]]; then SLOT="0/0.8" else SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz; - KEYWORDS="~amd64 ~arm64 ~riscv" + KEYWORDS="amd64 ~arm64 ~riscv" SLOT="0/$(ver_cut 1-2)" fi
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/, gui-wm/wayfire/files/
commit: 313a17318ddeb6039fd081da6793f64afad942d2 Author: Alfred Wingate protonmail com> AuthorDate: Tue Mar 19 09:36:33 2024 + Commit: Sam James gentoo org> CommitDate: Tue Mar 19 10:05:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=313a1731 gui-wm/wayfire: add patch to not use system installed configuration * Otherwise you would get hard to parse errors when different parts of build are built with different configurations. Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Sam James gentoo.org> ...wayfire-0.8.0-dont-use-installed-config-h.patch | 65 ++ ...ayfire-0.8.1.ebuild => wayfire-0.8.0-r2.ebuild} | 77 ++ ...ayfire-0.8.1.ebuild => wayfire-0.8.1-r1.ebuild} | 4 ++ 3 files changed, 134 insertions(+), 12 deletions(-) diff --git a/gui-wm/wayfire/files/wayfire-0.8.0-dont-use-installed-config-h.patch b/gui-wm/wayfire/files/wayfire-0.8.0-dont-use-installed-config-h.patch new file mode 100644 index ..3938cd955ce2 --- /dev/null +++ b/gui-wm/wayfire/files/wayfire-0.8.0-dont-use-installed-config-h.patch @@ -0,0 +1,65 @@ +https://github.com/WayfireWM/wayfire/pull/2225 + +From f7bcad19598cbff1324f7737022ffee8848b3555 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate +Date: Mon, 18 Mar 2024 16:32:06 +0200 +Subject: [PATCH] Copy config.h approach from wlroots-full.hpp to other public + api headers (#2225) + +* Otherwise wayfire could use the config.h of an already installed + wayfire installation and lead to confusing linking issues if the + options differed (like installed wayfire has xwayland disabled and the + new build has it enabled). + +Signed-off-by: Alfred Wingate +--- a/src/api/wayfire/debug.hpp b/src/api/wayfire/debug.hpp +@@ -1,8 +1,12 @@ + #ifndef DEBUG_HPP + #define DEBUG_HPP + +-#ifndef WAYFIRE_PLUGIN +-#include "config.h" ++// WF_USE_CONFIG_H is set only when building Wayfire itself, external plugins ++// need to use ++#ifdef WF_USE_CONFIG_H ++#include ++#else ++#include + #endif + + #define nonull(x) ((x) ? (x) : ("nil")) +--- a/src/api/wayfire/unstable/wlr-view-events.hpp b/src/api/wayfire/unstable/wlr-view-events.hpp +@@ -1,9 +1,11 @@ + #pragma once + +-#if __has_include() +-#include ++// WF_USE_CONFIG_H is set only when building Wayfire itself, external plugins ++// need to use ++#ifdef WF_USE_CONFIG_H ++#include + #else +-#include "config.h" ++#include + #endif + + #include +--- a/src/api/wayfire/unstable/xwl-toplevel-base.hpp b/src/api/wayfire/unstable/xwl-toplevel-base.hpp +@@ -1,9 +1,11 @@ + #pragma once + +-#if __has_include() +-#include ++// WF_USE_CONFIG_H is set only when building Wayfire itself, external plugins ++// need to use ++#ifdef WF_USE_CONFIG_H ++#include + #else +-#include "config.h" ++#include + #endif + + #include diff --git a/gui-wm/wayfire/wayfire-0.8.1.ebuild b/gui-wm/wayfire/wayfire-0.8.0-r2.ebuild similarity index 55% copy from gui-wm/wayfire/wayfire-0.8.1.ebuild copy to gui-wm/wayfire/wayfire-0.8.0-r2.ebuild index a5e655f6d398..c6ed5fedef88 100644 --- a/gui-wm/wayfire/wayfire-0.8.1.ebuild +++ b/gui-wm/wayfire/wayfire-0.8.0-r2.ebuild @@ -11,55 +11,99 @@ HOMEPAGE="https://github.com/WayfireWM/wayfire; if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git; - SLOT="0/0.8" + SLOT="0/" else SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz; - KEYWORDS="~amd64 ~arm64 ~riscv" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" SLOT="0/$(ver_cut 1-2)" fi LICENSE="MIT" -IUSE="+gles test X" +IUSE="+gles +system-wfconfig +system-wlroots test X" RESTRICT="!test? ( test )" # bundled wlroots has the following dependency string according to included headers. # wlroots[drm,gles2-renderer,libinput,x11-backend?,X?] # enable x11-backend with X and vice versa +WLROOTS_CDEPEND=" + >=dev-libs/libinput-1.14.0:= + >=dev-libs/wayland-1.21 + media-libs/libglvnd + media-libs/mesa[egl(+),gles2] + sys-apps/hwdata:= + sys-auth/seatd:= + >=x11-libs/libdrm-2.4.114:= + x11-libs/libxkbcommon + >=x11-libs/pixman-0.42.0 + virtual/libudev + X? ( + x11-base/xwayland + x11-libs/libxcb:0= + x11-libs/xcb-util-image + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) +" +WLROOTS_DEPEND=" + >=dev-libs/wayland-protocols-1.28 +" +WLROOTS_BDEPEND=" + dev-util/glslang + dev-util/wayland-scanner +" + CDEPEND=" dev-cpp/nlohmann_json - dev-libs/glib:2 dev-libs/libevdev - >=dev-libs/libinput-1.7.0:= + >=dev-libs/libinput-1.7.0 dev-libs/wayland >=dev-libs/wayland-protocols-1.12 - gui-libs/wf-config:${SLOT} -
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: ddd0ffa7c79197145f42e4499a8b68ef3a3966d3 Author: Alfred Wingate protonmail com> AuthorDate: Tue Mar 19 10:00:33 2024 + Commit: Sam James gentoo org> CommitDate: Tue Mar 19 10:05:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd0ffa7 gui-wm/wayfire: reword local use flags Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/35828 Signed-off-by: Sam James gentoo.org> gui-wm/wayfire/metadata.xml| 6 -- gui-wm/wayfire/wayfire-0.8.0-r2.ebuild | 4 ++-- gui-wm/wayfire/wayfire-0.8.1-r1.ebuild | 4 ++-- gui-wm/wayfire/wayfire-.ebuild | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml index b7ebd8524caf..fb1df8affac5 100644 --- a/gui-wm/wayfire/metadata.xml +++ b/gui-wm/wayfire/metadata.xml @@ -9,8 +9,10 @@ use libglvnd to do animations more efficiently -use the system-wide wf-config, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING. -use the system wide wlroots, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING. +Enable OpenGL ES 3.x Features. +Use the system-wide gui-libs/wf-config instead of building as a submodule. It will block system-wide gui-libs/wf-config from being installed. +Use the system-wide gui-libs/wlroots instead of building as a submodule. It will block system-wide gui-libs/wlroots from being installed. +Enable support for X11 applications (XWayland). WayfireWM/wayfire diff --git a/gui-wm/wayfire/wayfire-0.8.0-r2.ebuild b/gui-wm/wayfire/wayfire-0.8.0-r2.ebuild index c6ed5fedef88..d2c8b090436a 100644 --- a/gui-wm/wayfire/wayfire-0.8.0-r2.ebuild +++ b/gui-wm/wayfire/wayfire-0.8.0-r2.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="MIT" -IUSE="+gles +system-wfconfig +system-wlroots test X" +IUSE="+gles3 +system-wfconfig +system-wlroots test X" RESTRICT="!test? ( test )" # bundled wlroots has the following dependency string according to included headers. @@ -128,7 +128,7 @@ src_configure() { $(meson_feature system-wlroots use_system_wlroots) $(meson_feature test tests) $(meson_feature X xwayland) - $(meson_use gles enable_gles32) + $(meson_use gles3 enable_gles32) ) meson_src_configure diff --git a/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild b/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild index 094395b5b72e..82d800484181 100644 --- a/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild +++ b/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="MIT" -IUSE="+gles test X" +IUSE="+gles3 test X" RESTRICT="!test? ( test )" # bundled wlroots has the following dependency string according to included headers. @@ -77,7 +77,7 @@ src_configure() { local emesonargs=( $(meson_feature test tests) $(meson_feature X xwayland) - $(meson_use gles enable_gles32) + $(meson_use gles3 enable_gles32) -Duse_system_wfconfig=enabled -Duse_system_wlroots=enabled ) diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-.ebuild index 0666f1cd607d..6a2f5696709d 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="MIT" -IUSE="+gles test X" +IUSE="+gles3 test X" RESTRICT="!test? ( test )" # bundled wlroots has the following dependency string according to included headers. @@ -73,7 +73,7 @@ src_configure() { local emesonargs=( $(meson_feature test tests) $(meson_feature X xwayland) - $(meson_use gles enable_gles32) + $(meson_use gles3 enable_gles32) -Duse_system_wfconfig=enabled -Duse_system_wlroots=enabled )
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: e312ad721e81fe2929a97e4819ef4440afaa93d5 Author: Alfred Wingate protonmail com> AuthorDate: Thu Mar 14 11:22:54 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 16 19:18:09 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e312ad72 gui-wm/wayfire: add 0.8.1 * Remove system-wfconfig and system-wlroots use flags, the default will be to use system wf-config and system wlroots. Now that upstream is more active and targets specific wlroots major releases the point of system-wlroots has gone. wf-config has the same upstream so using a bundled version doesn't have much rationale. * Drop x86 keyword, wlroots-17 drm backend is unavailable for x86 and wayfire expects the backend unconditionally in its api. Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Arthur Zamarin gentoo.org> gui-wm/wayfire/Manifest | 1 + gui-wm/wayfire/wayfire-0.8.1.ebuild | 105 2 files changed, 106 insertions(+) diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index a9f7fe0b996e..60931f638e27 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1,2 +1,3 @@ DIST wayfire-0.7.5.tar.xz 781952 BLAKE2B 10f4927d793ad2f8047ab5608db72bb5988fbb4df805dc65a87b011453729109ca0b3a92cf89e867266fae52268e1e2ac452bbd6efcc81e8f1a0c0640008adc1 SHA512 fce6d4c81fa3675df1e656f8bf504f7fc9d1b7104687bcc6d669950582f46bd0ad084c6a487434077df029438243cd91cf6ec60dc7d584b40bfd7a4c8d069f53 DIST wayfire-0.8.0.tar.xz 828576 BLAKE2B 4d80a0d43061a4564d45f7c077fd97737b426c4036c12f004815dbad120f51b38b2fac9a010e2df27a6a96205cd0dcceb81864bdccbd6e337d81f6c37926e019 SHA512 fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1dfdc8b1b898d998a9 +DIST wayfire-0.8.1.tar.xz 856364 BLAKE2B 1b596b28878789ca26eeb57c6c24e0b69508731de2144e1477f8071b41f17757b2125f2f4f99670ca8b7f85172a9f641b9be1f9190eeff5b261bcc2df1bec4ab SHA512 7bce5656b6a7a7fe53b37492465dee3e591eb38fdd3d6876f4a589f059510fb2d0c0a326df260ca6a293edf4ba43bb55f813e85d4d2d38d6ef1319280254 diff --git a/gui-wm/wayfire/wayfire-0.8.1.ebuild b/gui-wm/wayfire/wayfire-0.8.1.ebuild new file mode 100644 index ..a5e655f6d398 --- /dev/null +++ b/gui-wm/wayfire/wayfire-0.8.1.ebuild @@ -0,0 +1,105 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="compiz like 3D wayland compositor" +HOMEPAGE="https://github.com/WayfireWM/wayfire; + +if [[ ${PV} == ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git; + SLOT="0/0.8" +else + SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz; + KEYWORDS="~amd64 ~arm64 ~riscv" + SLOT="0/$(ver_cut 1-2)" +fi + +LICENSE="MIT" +IUSE="+gles test X" +RESTRICT="!test? ( test )" + +# bundled wlroots has the following dependency string according to included headers. +# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?] +# enable x11-backend with X and vice versa +CDEPEND=" + dev-cpp/nlohmann_json + dev-libs/glib:2 + dev-libs/libevdev + >=dev-libs/libinput-1.7.0:= + dev-libs/wayland + >=dev-libs/wayland-protocols-1.12 + gui-libs/wf-config:${SLOT} + gui-libs/wlroots:0/17[drm(+),libinput(+),x11-backend,X?] + media-libs/glm + media-libs/libglvnd + media-libs/libjpeg-turbo:= + media-libs/libpng:= + x11-libs/cairo + x11-libs/libxkbcommon + x11-libs/pango + x11-libs/pixman + X? ( + x11-libs/libxcb:= + ) +" + +RDEPEND=" + ${CDEPEND} + x11-misc/xkeyboard-config +" +DEPEND=" + ${CDEPEND} + test? ( dev-cpp/doctest ) +" +BDEPEND=" + dev-util/wayland-scanner + virtual/pkgconfig +" + +src_prepare() { + default + + 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 +} + +src_configure() { + local emesonargs=( + $(meson_feature test tests) + $(meson_feature X xwayland) + $(meson_use gles enable_gles32) + -Duse_system_wfconfig=enabled + -Duse_system_wlroots=enabled + ) + + meson_src_configure +} + +src_install() { + meson_src_install + dobin "${T}"/wayfire-session + + insinto "/usr/share/wayland-sessions/" + insopts -m644 + doins wayfire.desktop + doins "${T}"/wayfire-session.desktop + + insinto "/usr/share/wayfire/" + doins wayfire.ini +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Wayfire has been installed but the session cannot be
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/, gui-wm/wayfire/files/
commit: 25e6c5f39257e9bbfb166f763a2c18000c0fc1b6 Author: Alfred Wingate protonmail com> AuthorDate: Thu Mar 14 11:47:56 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 16 19:18:09 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e6c5f3 gui-wm/wayfire: drop 0.7.5-r1, 0.8.0 Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Arthur Zamarin gentoo.org> gui-wm/wayfire/Manifest| 1 - gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch | 25 gui-wm/wayfire/wayfire-0.7.5-r1.ebuild | 116 --- gui-wm/wayfire/wayfire-0.8.0.ebuild| 153 - 4 files changed, 295 deletions(-) diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index 60931f638e27..45e2431c82bb 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1,3 +1,2 @@ -DIST wayfire-0.7.5.tar.xz 781952 BLAKE2B 10f4927d793ad2f8047ab5608db72bb5988fbb4df805dc65a87b011453729109ca0b3a92cf89e867266fae52268e1e2ac452bbd6efcc81e8f1a0c0640008adc1 SHA512 fce6d4c81fa3675df1e656f8bf504f7fc9d1b7104687bcc6d669950582f46bd0ad084c6a487434077df029438243cd91cf6ec60dc7d584b40bfd7a4c8d069f53 DIST wayfire-0.8.0.tar.xz 828576 BLAKE2B 4d80a0d43061a4564d45f7c077fd97737b426c4036c12f004815dbad120f51b38b2fac9a010e2df27a6a96205cd0dcceb81864bdccbd6e337d81f6c37926e019 SHA512 fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1dfdc8b1b898d998a9 DIST wayfire-0.8.1.tar.xz 856364 BLAKE2B 1b596b28878789ca26eeb57c6c24e0b69508731de2144e1477f8071b41f17757b2125f2f4f99670ca8b7f85172a9f641b9be1f9190eeff5b261bcc2df1bec4ab SHA512 7bce5656b6a7a7fe53b37492465dee3e591eb38fdd3d6876f4a589f059510fb2d0c0a326df260ca6a293edf4ba43bb55f813e85d4d2d38d6ef1319280254 diff --git a/gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch b/gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch deleted file mode 100644 index 0ee64c93.. --- a/gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/WayfireWM/wf-utils/pull/5 - -From 57460e364f6a1e5bdbad424e8cc576e346c8b7b6 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Tue, 18 Apr 2023 08:26:50 +0100 -Subject: [PATCH] Fix build with GCC 13 - -GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some -are no longer transitively included. - -See https://gnu.org/software/gcc/gcc-13/porting_to.html. - -Bug: https://bugs.gentoo.org/895570 -Closes: https://github.com/WayfireWM/wayfire/issues/1758 a/subprojects/wf-utils/wayfire/rule/lambda_rule.cpp -+++ b/subprojects/wf-utils/wayfire/rule/lambda_rule.cpp -@@ -1,6 +1,7 @@ - #include "wayfire/rule/lambda_rule.hpp" - #include "wayfire/condition/condition.hpp" - #include -+#include - #include - #include - #include - diff --git a/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild b/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild deleted file mode 100644 index eed7d341eeca.. --- a/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -DESCRIPTION="compiz like 3D wayland compositor" -HOMEPAGE="https://github.com/WayfireWM/wayfire; - -if [[ ${PV} == ]]; then - inherit git-r3 - 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 ~riscv ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="+gles +system-wfconfig +system-wlroots X" - -DEPEND=" - dev-libs/libinput:= - dev-libs/wayland - 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(+)] - x11-libs/libxkbcommon[X?] - x11-libs/pango - x11-libs/pixman - X? ( - x11-base/xwayland - x11-libs/libxcb - ) -" - -if [[ ${PV} == ]] ; then - DEPEND+=" - system-wfconfig? ( ~gui-libs/wf-config-:= ) - !system-wfconfig? ( !gui-libs/wf-config ) - system-wlroots? ( ~gui-libs/wlroots-:=[drm(+),libinput(+),x11-backend,X?] ) - !system-wlroots? ( !gui-libs/wlroots ) - " -else - DEPEND+=" - system-wfconfig? ( - >=gui-libs/wf-config-0.7.1 - =gui-libs/wlroots-0.16.0:0/16[drm(+),libinput(+),x11-backend,X?] - ) - !system-wlroots? ( !gui-libs/wlroots ) - " -fi - -RDEPEND=" - ${DEPEND} - x11-misc/xkeyboard-config -" - -BDEPEND=" - dev-libs/wayland-protocols -
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 49e20c85ca4aada2f761df4c74cc7b2087d49b45 Author: Alfred Wingate protonmail com> AuthorDate: Thu Mar 14 11:37:48 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 16 19:18:09 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e20c85 gui-wm/wayfire: update live ebuild * Remove system-wfconfig and system-wlroots use flags, the default will be to use system wf-config and system wlroots. Now that upstream is more active and targets specific wlroots major releases the point of system-wlroots has gone. wf-config has the same upstream so using a bundled version doesn't have much rationale. * Remove dependency on wlroots- and instead require a specific major release of wlroots that could be updated as seen fit. Closes: https://bugs.gentoo.org/916431 Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Arthur Zamarin gentoo.org> gui-wm/wayfire/wayfire-.ebuild | 79 -- 1 file changed, 15 insertions(+), 64 deletions(-) diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-.ebuild index d1cadbe72df8..0666f1cd607d 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-.ebuild @@ -11,120 +11,71 @@ HOMEPAGE="https://github.com/WayfireWM/wayfire; if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git; - SLOT="0/" + SLOT="0/0.9" else SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz; - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm64 ~riscv" SLOT="0/$(ver_cut 1-2)" fi LICENSE="MIT" -IUSE="+gles +system-wfconfig +system-wlroots test X" +IUSE="+gles test X" RESTRICT="!test? ( test )" # bundled wlroots has the following dependency string according to included headers. # wlroots[drm,gles2-renderer,libinput,x11-backend?,X?] # enable x11-backend with X and vice versa -WLROOTS_CDEPEND=" - >=dev-libs/libinput-1.14.0:= - >=dev-libs/wayland-1.22 - media-libs/libdisplay-info - media-libs/libglvnd - media-libs/mesa[egl(+),gles2] - sys-apps/hwdata:= - sys-auth/seatd:= - >=x11-libs/libdrm-2.4.114:= - x11-libs/libxkbcommon - >=x11-libs/pixman-0.42.0 - virtual/libudev - X? ( - x11-base/xwayland - x11-libs/libxcb:0= - x11-libs/xcb-util-image - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) -" -WLROOTS_DEPEND=" - >=dev-libs/wayland-protocols-1.32 -" -WLROOTS_BDEPEND=" - dev-util/glslang - dev-util/wayland-scanner -" - CDEPEND=" dev-cpp/nlohmann_json + dev-libs/glib:2 dev-libs/libevdev - >=dev-libs/libinput-1.7.0 + >=dev-libs/libinput-1.7.0:= dev-libs/wayland >=dev-libs/wayland-protocols-1.12 + gui-libs/wf-config:${SLOT} + gui-libs/wlroots:0/17[drm(+),libinput(+),x11-backend,X?] media-libs/glm media-libs/libglvnd - media-libs/libjpeg-turbo - media-libs/libpng + media-libs/libjpeg-turbo:= + media-libs/libpng:= x11-libs/cairo - x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman - system-wfconfig? ( gui-libs/wf-config:${SLOT} ) - !system-wfconfig? ( dev-libs/libxml2 ) - !system-wlroots? ( ${WLROOTS_CDEPEND} ) + X? ( + x11-libs/libxcb:= + ) " -if [[ ${PV} == ]] ; then - CDEPEND+=" - system-wlroots? ( gui-libs/wlroots:0/[drm(+),libinput(+),x11-backend,X?] ) - " -else - CDEPEND+=" - system-wlroots? ( gui-libs/wlroots:0/16[drm(+),libinput(+),x11-backend,X?] ) - " -fi - RDEPEND=" ${CDEPEND} x11-misc/xkeyboard-config - !system-wfconfig? ( !gui-libs/wf-config ) - !system-wlroots? ( !gui-libs/wlroots ) " DEPEND=" ${CDEPEND} - !system-wlroots? ( ${WLROOTS_DEPEND} ) test? ( dev-cpp/doctest ) " BDEPEND=" dev-util/wayland-scanner virtual/pkgconfig - !system-wlroots? ( ${WLROOTS_BDEPEND} ) " src_prepare() { - eapply_user + default 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 - - if [[ "${PV}" != ]]; then - # Don't run git if git is installed and its not a git dir - sed -i \ - -e "/git = find_program/ifs = import\('fs'\)" \ - -e "s/if git.found()/if git.found() and fs.is_dir('.git')/" \ - meson.build || die - fi - } src_configure() { local emesonargs=( -
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 0d3b3e454fe1d7438bcfb27c5a9bdf048a9886d3 Author: Arthur Zamarin gentoo org> AuthorDate: Thu Mar 14 16:55:10 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Mar 14 16:55:10 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d3b3e45 gui-wm/wayfire: Stabilize 0.8.0-r1 amd64, #927023 Signed-off-by: Arthur Zamarin gentoo.org> gui-wm/wayfire/wayfire-0.8.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild b/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild index 21f177deca0c..4dd1a09a0f71 100644 --- a/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild +++ b/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == ]]; then SLOT="0/" else SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz; - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + KEYWORDS="amd64 ~arm64 ~riscv ~x86" SLOT="0/$(ver_cut 1-2)" fi
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 59a3a277d2adecbbfda0c88adf31583fd0cf99eb Author: Alfred Wingate protonmail com> AuthorDate: Tue Jan 30 12:45:38 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 30 13:48:34 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59a3a277 gui-wm/wayfire: remove debug use flag [sam: It's not appropriate to have a USE flag just for compiler flags, plus asan/ubsan/valgrind aren't appropriate in ebuilds either as they're so sensitive to e.g. sandbox.] Closes: https://bugs.gentoo.org/92 Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/35092 Signed-off-by: Sam James gentoo.org> gui-wm/wayfire/wayfire-0.7.5-r1.ebuild | 11 +++ gui-wm/wayfire/wayfire-0.8.0-r1.ebuild | 9 ++--- gui-wm/wayfire/wayfire-0.8.0.ebuild| 9 ++--- gui-wm/wayfire/wayfire-.ebuild | 11 +++ 4 files changed, 10 insertions(+), 30 deletions(-) diff --git a/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild b/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild index d2d80d37344a..eed7d341eeca 100644 --- a/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit meson toolchain-funcs +inherit meson DESCRIPTION="compiz like 3D wayland compositor" HOMEPAGE="https://github.com/WayfireWM/wayfire; @@ -18,7 +18,7 @@ fi LICENSE="MIT" SLOT="0" -IUSE="debug +gles +system-wfconfig +system-wlroots X" +IUSE="+gles +system-wfconfig +system-wlroots X" DEPEND=" dev-libs/libinput:= @@ -87,13 +87,8 @@ src_configure() { $(meson_feature system-wlroots use_system_wlroots) $(meson_feature X xwayland) $(meson_use gles enable_gles32) - $(usex debug --buildtype=debug "") - $(usex debug -Db_sanitize=address,undefined "") ) - # Clang will fail to link without this - tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") ) - meson_src_configure } diff --git a/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild b/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild index 1fb2416c2bd8..21f177deca0c 100644 --- a/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild +++ b/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit meson toolchain-funcs +inherit meson DESCRIPTION="compiz like 3D wayland compositor" HOMEPAGE="https://github.com/WayfireWM/wayfire; @@ -19,7 +19,7 @@ else fi LICENSE="MIT" -IUSE="debug +gles +system-wfconfig +system-wlroots test X" +IUSE="+gles +system-wfconfig +system-wlroots test X" RESTRICT="!test? ( test )" # bundled wlroots has the following dependency string according to included headers. @@ -128,13 +128,8 @@ src_configure() { $(meson_feature test tests) $(meson_feature X xwayland) $(meson_use gles enable_gles32) - $(usex debug --buildtype=debug "") - $(usex debug -Db_sanitize=address,undefined "") ) - # Clang will fail to link without this - tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") ) - meson_src_configure } diff --git a/gui-wm/wayfire/wayfire-0.8.0.ebuild b/gui-wm/wayfire/wayfire-0.8.0.ebuild index 82a5b045146c..15e5598edc0f 100644 --- a/gui-wm/wayfire/wayfire-0.8.0.ebuild +++ b/gui-wm/wayfire/wayfire-0.8.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit meson toolchain-funcs +inherit meson DESCRIPTION="compiz like 3D wayland compositor" HOMEPAGE="https://github.com/WayfireWM/wayfire; @@ -19,7 +19,7 @@ else fi LICENSE="MIT" -IUSE="debug +gles +system-wfconfig +system-wlroots test X" +IUSE="+gles +system-wfconfig +system-wlroots test X" RESTRICT="!test? ( test )" # bundled wlroots has the following dependency string according to included headers. @@ -124,13 +124,8 @@ src_configure() { $(meson_feature test tests) $(meson_feature X xwayland) $(meson_use gles enable_gles32) - $(usex debug --buildtype=debug "") - $(usex debug -Db_sanitize=address,undefined "") ) - # Clang will fail to link without this - tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") ) - meson_src_configure } diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-.ebuild index 98fb0ebc32f0..d1cadbe72df8 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-.ebuild @@ -1,9 +1,9 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit meson toolchain-funcs +inherit meson DESCRIPTION="compiz like 3D wayland compositor" HOMEPAGE="https://github.com/WayfireWM/wayfire; @@ -19,7 +19,7 @@ else fi LICENSE="MIT"
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/, gui-wm/wayfire/files/
commit: b80e6a855ec9c0d2b96782ad8b72555295f85340 Author: Alfred Wingate protonmail com> AuthorDate: Thu Jan 25 16:06:09 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 30 11:32:39 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b80e6a85 gui-wm/wayfire: fix duplicate manpage Closes: https://bugs.gentoo.org/922898 Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/35009 Signed-off-by: Sam James gentoo.org> .../wayfire-0.8.0-fix-duplicate-manpage.patch | 21 +++ gui-wm/wayfire/wayfire-0.8.0-r1.ebuild | 162 + 2 files changed, 183 insertions(+) diff --git a/gui-wm/wayfire/files/wayfire-0.8.0-fix-duplicate-manpage.patch b/gui-wm/wayfire/files/wayfire-0.8.0-fix-duplicate-manpage.patch new file mode 100644 index ..393de41d0ccb --- /dev/null +++ b/gui-wm/wayfire/files/wayfire-0.8.0-fix-duplicate-manpage.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/922898 +https://github.com/WayfireWM/wayfire/issues/1942 +https://github.com/WayfireWM/wayfire/pull/1943 +https://github.com/WayfireWM/wayfire/commit/564b75a45d7c844b61b510e68fa527109fce4a75 + +From 564b75a45d7c844b61b510e68fa527109fce4a75 Mon Sep 17 00:00:00 2001 +From: alice +Date: Sat, 7 Oct 2023 22:51:35 +0200 +Subject: [PATCH] meson: fix duplicate installation of manpage (#1943) + +closes #1942 +--- a/man/meson.build b/man/meson.build +@@ -1,7 +1,5 @@ + configure_file(input: 'wayfire.1.in', +output: 'wayfire.1', +- install: true, +- install_dir: 'man', +configuration: conf_data) + + install_man(join_paths(meson.project_build_root(), 'man', 'wayfire.1')) diff --git a/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild b/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild new file mode 100644 index ..1fb2416c2bd8 --- /dev/null +++ b/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild @@ -0,0 +1,162 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson toolchain-funcs + +DESCRIPTION="compiz like 3D wayland compositor" +HOMEPAGE="https://github.com/WayfireWM/wayfire; + +if [[ ${PV} == ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git; + SLOT="0/" +else + SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz; + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + SLOT="0/$(ver_cut 1-2)" +fi + +LICENSE="MIT" +IUSE="debug +gles +system-wfconfig +system-wlroots test X" +RESTRICT="!test? ( test )" + +# bundled wlroots has the following dependency string according to included headers. +# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?] +# enable x11-backend with X and vice versa +WLROOTS_CDEPEND=" + >=dev-libs/libinput-1.14.0:= + >=dev-libs/wayland-1.21 + media-libs/libglvnd + media-libs/mesa[egl(+),gles2] + sys-apps/hwdata:= + sys-auth/seatd:= + >=x11-libs/libdrm-2.4.114:= + x11-libs/libxkbcommon + >=x11-libs/pixman-0.42.0 + virtual/libudev + X? ( + x11-base/xwayland + x11-libs/libxcb:0= + x11-libs/xcb-util-image + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) +" +WLROOTS_DEPEND=" + >=dev-libs/wayland-protocols-1.28 +" +WLROOTS_BDEPEND=" + dev-util/glslang + dev-util/wayland-scanner +" + +CDEPEND=" + dev-cpp/nlohmann_json + dev-libs/libevdev + >=dev-libs/libinput-1.7.0 + dev-libs/wayland + >=dev-libs/wayland-protocols-1.12 + media-libs/glm + media-libs/libglvnd + media-libs/libjpeg-turbo:= + media-libs/libpng:= + x11-libs/cairo + x11-libs/libdrm:= + x11-libs/libxkbcommon + x11-libs/pango + x11-libs/pixman + system-wfconfig? ( gui-libs/wf-config:${SLOT} ) + !system-wfconfig? ( dev-libs/libxml2 ) + !system-wlroots? ( ${WLROOTS_CDEPEND} ) +" + +if [[ ${PV} == ]] ; then + CDEPEND+=" + system-wlroots? ( gui-libs/wlroots:0/[drm(+),libinput(+),x11-backend,X?] ) + " +else + CDEPEND+=" + system-wlroots? ( gui-libs/wlroots:0/16[drm(+),libinput(+),x11-backend,X?] ) + " +fi + +RDEPEND=" + ${CDEPEND} + x11-misc/xkeyboard-config + !system-wfconfig? ( !gui-libs/wf-config ) + !system-wlroots? ( !gui-libs/wlroots ) +" +DEPEND=" + ${CDEPEND} + !system-wlroots? ( ${WLROOTS_DEPEND} ) + test? ( dev-cpp/doctest ) +" +BDEPEND=" + dev-util/wayland-scanner + virtual/pkgconfig + !system-wlroots? ( ${WLROOTS_BDEPEND} ) +" + +PATCHES=( + "${FILESDIR}/wayfire-0.8.0-fix-duplicate-manpage.patch" +) + +src_prepare() { + default + + sed -e "s:@EPREFIX@:${EPREFIX}:" \ + "${FILESDIR}"/wayfire-session >
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 9b3d4730b9b33498bda91ef56aec7a387746c5f1 Author: Sam James gentoo org> AuthorDate: Sun Jan 21 05:04:28 2024 + Commit: Sam James gentoo org> CommitDate: Sun Jan 21 05:04:28 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b3d4730 gui-wm/wayfire: Stabilize 0.8.0 amd64, #922537 Signed-off-by: Sam James gentoo.org> gui-wm/wayfire/wayfire-0.8.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui-wm/wayfire/wayfire-0.8.0.ebuild b/gui-wm/wayfire/wayfire-0.8.0.ebuild index e732574d1134..82a5b045146c 100644 --- a/gui-wm/wayfire/wayfire-0.8.0.ebuild +++ b/gui-wm/wayfire/wayfire-0.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ if [[ ${PV} == ]]; then SLOT="0/" else SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz; - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + KEYWORDS="amd64 ~arm64 ~riscv ~x86" SLOT="0/$(ver_cut 1-2)" fi
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: d5a75407fc092956c4d2c19aa1ec74f369d77f41 Author: Alfred Wingate protonmail com> AuthorDate: Thu Dec 21 13:01:28 2023 + Commit: Ben Kohler gentoo org> CommitDate: Fri Jan 19 13:55:00 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a75407 gui-wm/wayfire: drop 0.7.3-r3, 0.7.5 Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Ben Kohler gentoo.org> gui-wm/wayfire/Manifest| 1 - gui-wm/wayfire/wayfire-0.7.3-r3.ebuild | 105 gui-wm/wayfire/wayfire-0.7.5.ebuild| 121 - 3 files changed, 227 deletions(-) diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index 1d54c8fd01bb..a9f7fe0b996e 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1,3 +1,2 @@ -DIST wayfire-0.7.3.tar.xz 765524 BLAKE2B b82c66796d7fb3d07c7bd9078755b7c38df1bd5c93daa659fc98b1182679bc0a06a24b322c6ab492d06d30c898659e2ba849c1d5944260e8775a04fd8a5bd078 SHA512 7bb5b8492a632a9816e847ec72def74dc234bcc30da7c320a0cd3b1d60492f5521ad8ac76a12ef967d1b114bcde9be72eb8ffc618977aed8e198d4ace1e7056e DIST wayfire-0.7.5.tar.xz 781952 BLAKE2B 10f4927d793ad2f8047ab5608db72bb5988fbb4df805dc65a87b011453729109ca0b3a92cf89e867266fae52268e1e2ac452bbd6efcc81e8f1a0c0640008adc1 SHA512 fce6d4c81fa3675df1e656f8bf504f7fc9d1b7104687bcc6d669950582f46bd0ad084c6a487434077df029438243cd91cf6ec60dc7d584b40bfd7a4c8d069f53 DIST wayfire-0.8.0.tar.xz 828576 BLAKE2B 4d80a0d43061a4564d45f7c077fd97737b426c4036c12f004815dbad120f51b38b2fac9a010e2df27a6a96205cd0dcceb81864bdccbd6e337d81f6c37926e019 SHA512 fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1dfdc8b1b898d998a9 diff --git a/gui-wm/wayfire/wayfire-0.7.3-r3.ebuild b/gui-wm/wayfire/wayfire-0.7.3-r3.ebuild deleted file mode 100644 index 11c7657d676e.. --- a/gui-wm/wayfire/wayfire-0.7.3-r3.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 2019-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson toolchain-funcs - -DESCRIPTION="compiz like 3D wayland compositor" -HOMEPAGE="https://github.com/WayfireWM/wayfire; - -if [[ ${PV} == ]]; then - inherit git-r3 - 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 ~riscv ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="debug +gles +system-wfconfig +system-wlroots X" - -DEPEND=" - dev-libs/libinput:= - dev-libs/wayland - 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(+)] - x11-libs/libxkbcommon[X?] - x11-libs/pango - x11-libs/pixman - X? ( - x11-base/xwayland - x11-libs/libxcb - ) - system-wfconfig? ( - >=gui-libs/wf-config-0.7.1 - =gui-libs/wlroots-0.15.1:0/15[X?] - ) - !system-wlroots? ( !gui-libs/wlroots ) -" - -RDEPEND=" - ${DEPEND} - 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) - $(usex debug --buildtype=debug "") - $(usex debug -Db_sanitize=address,undefined "") - ) - - # Clang will fail to link without this - tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") ) - - meson_src_configure -} - -src_install() { - meson_src_install - dobin "${T}"/wayfire-session - - insinto "/usr/share/wayland-sessions/" - insopts -m644 - doins wayfire.desktop - doins "${T}"/wayfire-session.desktop - - 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/wayfire/wayfire.ini\"" - elog "To install the file execute" - elog "\$ cp
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: a6da6e062fd05e637af7a70fe8644be36b3c579a Author: Alfred Wingate protonmail com> AuthorDate: Sat Nov 25 22:54:45 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 17 19:55:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6da6e06 gui-wm/wayfire: add 0.8.0 Bug: https://bugs.gentoo.org/915795 Bug: https://bugs.gentoo.org/916431 Closes: https://bugs.gentoo.org/831959 Closes: https://bugs.gentoo.org/859256 Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Arthur Zamarin gentoo.org> gui-wm/wayfire/Manifest | 1 + gui-wm/wayfire/wayfire-0.8.0.ebuild | 158 gui-wm/wayfire/wayfire-.ebuild | 118 ++- 3 files changed, 239 insertions(+), 38 deletions(-) diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index b0f036b8be78..1d54c8fd01bb 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1,2 +1,3 @@ DIST wayfire-0.7.3.tar.xz 765524 BLAKE2B b82c66796d7fb3d07c7bd9078755b7c38df1bd5c93daa659fc98b1182679bc0a06a24b322c6ab492d06d30c898659e2ba849c1d5944260e8775a04fd8a5bd078 SHA512 7bb5b8492a632a9816e847ec72def74dc234bcc30da7c320a0cd3b1d60492f5521ad8ac76a12ef967d1b114bcde9be72eb8ffc618977aed8e198d4ace1e7056e DIST wayfire-0.7.5.tar.xz 781952 BLAKE2B 10f4927d793ad2f8047ab5608db72bb5988fbb4df805dc65a87b011453729109ca0b3a92cf89e867266fae52268e1e2ac452bbd6efcc81e8f1a0c0640008adc1 SHA512 fce6d4c81fa3675df1e656f8bf504f7fc9d1b7104687bcc6d669950582f46bd0ad084c6a487434077df029438243cd91cf6ec60dc7d584b40bfd7a4c8d069f53 +DIST wayfire-0.8.0.tar.xz 828576 BLAKE2B 4d80a0d43061a4564d45f7c077fd97737b426c4036c12f004815dbad120f51b38b2fac9a010e2df27a6a96205cd0dcceb81864bdccbd6e337d81f6c37926e019 SHA512 fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1dfdc8b1b898d998a9 diff --git a/gui-wm/wayfire/wayfire-0.8.0.ebuild b/gui-wm/wayfire/wayfire-0.8.0.ebuild new file mode 100644 index ..7e1b3e3efe4b --- /dev/null +++ b/gui-wm/wayfire/wayfire-0.8.0.ebuild @@ -0,0 +1,158 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson toolchain-funcs + +DESCRIPTION="compiz like 3D wayland compositor" +HOMEPAGE="https://github.com/WayfireWM/wayfire; + +if [[ ${PV} == ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git; + SLOT="0/" +else + SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz; + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + SLOT="0/$(ver_cut 1-2)" +fi + +LICENSE="MIT" +IUSE="debug +gles +system-wfconfig +system-wlroots test X" +RESTRICT="!test? ( test )" + +# bundled wlroots has the following dependency string according to included headers. +# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?] +# enable x11-backend with X and vice versa +WLROOTS_CDEPEND=" + >=dev-libs/libinput-1.14.0:= + >=dev-libs/wayland-1.21 + media-libs/libglvnd + media-libs/mesa[egl(+),gles2] + sys-apps/hwdata:= + sys-auth/seatd:= + >=x11-libs/libdrm-2.4.114:= + x11-libs/libxkbcommon + >=x11-libs/pixman-0.42.0 + virtual/libudev + X? ( + x11-base/xwayland + x11-libs/libxcb:0= + x11-libs/xcb-util-image + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) +" +WLROOTS_DEPEND=" + >=dev-libs/wayland-protocols-1.28 +" +WLROOTS_BDEPEND=" + dev-util/glslang + dev-util/wayland-scanner +" + +CDEPEND=" + dev-cpp/nlohmann_json + dev-libs/libevdev + >=dev-libs/libinput-1.7.0 + dev-libs/wayland + >=dev-libs/wayland-protocols-1.12 + media-libs/glm + media-libs/libglvnd + media-libs/libjpeg-turbo:= + media-libs/libpng:= + x11-libs/cairo + x11-libs/libdrm:= + x11-libs/libxkbcommon + x11-libs/pango + x11-libs/pixman + system-wfconfig? ( gui-libs/wf-config:${SLOT} ) + !system-wfconfig? ( dev-libs/libxml2 ) + !system-wlroots? ( ${WLROOTS_CDEPEND} ) +" + +if [[ ${PV} == ]] ; then + CDEPEND+=" + system-wlroots? ( gui-libs/wlroots:0/[drm(+),libinput(+),x11-backend,X?] ) + " +else + CDEPEND+=" + system-wlroots? ( gui-libs/wlroots:0/16[drm(+),libinput(+),x11-backend,X?] ) + " +fi + +RDEPEND=" + ${CDEPEND} + x11-misc/xkeyboard-config + !system-wfconfig? ( !gui-libs/wf-config ) + !system-wlroots? ( !gui-libs/wlroots ) +" +DEPEND=" + ${CDEPEND} + !system-wlroots? ( ${WLROOTS_DEPEND} ) + test? ( dev-cpp/doctest ) +" +BDEPEND=" + dev-util/wayland-scanner + virtual/pkgconfig + !system-wlroots? ( ${WLROOTS_BDEPEND} ) +" + +src_prepare() { + eapply_user + +
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 613ac37adca39163876e5d3ac3fdf5e6a5985b80 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Dec 1 20:02:04 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Dec 1 20:02:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=613ac37a gui-wm/wayfire: Stabilize 0.7.5-r1 amd64, #918978 Signed-off-by: Arthur Zamarin gentoo.org> gui-wm/wayfire/wayfire-0.7.5-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild b/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild index 7f3bce722041..d2d80d37344a 100644 --- a/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; 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 ~riscv ~x86" + KEYWORDS="amd64 ~arm64 ~riscv ~x86" fi LICENSE="MIT"
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 0341dc62576853a537af25547ac6a93acf842913 Author: Alfred Wingate protonmail com> AuthorDate: Tue Aug 1 18:03:07 2023 + Commit: Sam James gentoo org> CommitDate: Mon Aug 7 02:53:43 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0341dc62 gui-wm/wayfire: require missing use flags * drm and libinput were made optional in wlroots-0.15, they are required by wayfire unconditionally though. * Require x11-backend in wlroots to avoid automagic in wayfire. https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/b37731cdbbef4dc52033c2d26b04d2329720fa07 https://github.com/WayfireWM/wayfire/blob/v0.7.5/meson.build#L133 Closes: https://bugs.gentoo.org/907638 Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/32131 Signed-off-by: Sam James gentoo.org> gui-wm/wayfire/{wayfire-.ebuild => wayfire-0.7.5-r1.ebuild} | 8 ++-- gui-wm/wayfire/wayfire-.ebuild | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild similarity index 93% copy from gui-wm/wayfire/wayfire-.ebuild copy to gui-wm/wayfire/wayfire-0.7.5-r1.ebuild index 42ab1b20d21d..7f3bce722041 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild @@ -46,7 +46,7 @@ if [[ ${PV} == ]] ; then DEPEND+=" system-wfconfig? ( ~gui-libs/wf-config-:= ) !system-wfconfig? ( !gui-libs/wf-config ) - system-wlroots? ( ~gui-libs/wlroots-:=[X?] ) + system-wlroots? ( ~gui-libs/wlroots-:=[drm(+),libinput(+),x11-backend,X?] ) !system-wlroots? ( !gui-libs/wlroots ) " else @@ -57,7 +57,7 @@ else ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( - >=gui-libs/wlroots-0.16.0:0/16[X?] + >=gui-libs/wlroots-0.16.0:0/16[drm(+),libinput(+),x11-backend,X?] ) !system-wlroots? ( !gui-libs/wlroots ) " @@ -73,6 +73,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-0.7.5-gcc13.patch +) + src_configure() { sed -e "s:@EPREFIX@:${EPREFIX}:" \ "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-.ebuild index 42ab1b20d21d..9ff84a6351ce 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-.ebuild @@ -46,7 +46,7 @@ if [[ ${PV} == ]] ; then DEPEND+=" system-wfconfig? ( ~gui-libs/wf-config-:= ) !system-wfconfig? ( !gui-libs/wf-config ) - system-wlroots? ( ~gui-libs/wlroots-:=[X?] ) + system-wlroots? ( ~gui-libs/wlroots-:=[drm(+),libinput(+),x11-backend,X?] ) !system-wlroots? ( !gui-libs/wlroots ) " else @@ -57,7 +57,7 @@ else ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( - >=gui-libs/wlroots-0.16.0:0/16[X?] + >=gui-libs/wlroots-0.16.0:0/16[drm(+),libinput(+),x11-backend,X?] ) !system-wlroots? ( !gui-libs/wlroots ) "
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/files/, gui-wm/wayfire/
commit: bc5186b2759f5b09580ed33275b345d842ed0be3 Author: Sam James gentoo org> AuthorDate: Tue Apr 18 07:29:28 2023 + Commit: Sam James gentoo org> CommitDate: Tue Apr 18 07:29:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc5186b2 gui-wm/wayfire: fix build w/ gcc 13 Closes: https://bugs.gentoo.org/895570 Signed-off-by: Sam James gentoo.org> gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch | 25 + gui-wm/wayfire/wayfire-0.7.5.ebuild| 4 2 files changed, 29 insertions(+) diff --git a/gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch b/gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch new file mode 100644 index ..0ee64c93 --- /dev/null +++ b/gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch @@ -0,0 +1,25 @@ +https://github.com/WayfireWM/wf-utils/pull/5 + +From 57460e364f6a1e5bdbad424e8cc576e346c8b7b6 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 18 Apr 2023 08:26:50 +0100 +Subject: [PATCH] Fix build with GCC 13 + +GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some +are no longer transitively included. + +See https://gnu.org/software/gcc/gcc-13/porting_to.html. + +Bug: https://bugs.gentoo.org/895570 +Closes: https://github.com/WayfireWM/wayfire/issues/1758 +--- a/subprojects/wf-utils/wayfire/rule/lambda_rule.cpp b/subprojects/wf-utils/wayfire/rule/lambda_rule.cpp +@@ -1,6 +1,7 @@ + #include "wayfire/rule/lambda_rule.hpp" + #include "wayfire/condition/condition.hpp" + #include ++#include + #include + #include + #include + diff --git a/gui-wm/wayfire/wayfire-0.7.5.ebuild b/gui-wm/wayfire/wayfire-0.7.5.ebuild index 3daa6027b141..9aa8f0449f9d 100644 --- a/gui-wm/wayfire/wayfire-0.7.5.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.5.ebuild @@ -73,6 +73,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-0.7.5-gcc13.patch +) + src_configure() { sed -e "s:@EPREFIX@:${EPREFIX}:" \ "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 99085aa79cf1e88c54119277999db4a7661431e3 Author: Aisha Tammy bsd ac> AuthorDate: Sun Feb 12 12:45:12 2023 + Commit: Sam James gentoo org> CommitDate: Mon Feb 13 00:39:01 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99085aa7 gui-wm/wayfire: add 0.7.5 Closes: https://bugs.gentoo.org/884055 Signed-off-by: Aisha Tammy bsd.ac> Signed-off-by: Sam James gentoo.org> gui-wm/wayfire/Manifest | 1 + gui-wm/wayfire/wayfire-0.7.5.ebuild | 105 2 files changed, 106 insertions(+) diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index 90f60019c070..b0f036b8be78 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1 +1,2 @@ DIST wayfire-0.7.3.tar.xz 765524 BLAKE2B b82c66796d7fb3d07c7bd9078755b7c38df1bd5c93daa659fc98b1182679bc0a06a24b322c6ab492d06d30c898659e2ba849c1d5944260e8775a04fd8a5bd078 SHA512 7bb5b8492a632a9816e847ec72def74dc234bcc30da7c320a0cd3b1d60492f5521ad8ac76a12ef967d1b114bcde9be72eb8ffc618977aed8e198d4ace1e7056e +DIST wayfire-0.7.5.tar.xz 781952 BLAKE2B 10f4927d793ad2f8047ab5608db72bb5988fbb4df805dc65a87b011453729109ca0b3a92cf89e867266fae52268e1e2ac452bbd6efcc81e8f1a0c0640008adc1 SHA512 fce6d4c81fa3675df1e656f8bf504f7fc9d1b7104687bcc6d669950582f46bd0ad084c6a487434077df029438243cd91cf6ec60dc7d584b40bfd7a4c8d069f53 diff --git a/gui-wm/wayfire/wayfire-0.7.5.ebuild b/gui-wm/wayfire/wayfire-0.7.5.ebuild new file mode 100644 index ..df69e38f7f8c --- /dev/null +++ b/gui-wm/wayfire/wayfire-0.7.5.ebuild @@ -0,0 +1,105 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson toolchain-funcs + +DESCRIPTION="compiz like 3D wayland compositor" +HOMEPAGE="https://github.com/WayfireWM/wayfire; + +if [[ ${PV} == ]]; then + inherit git-r3 + 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 ~riscv ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="debug +gles +system-wfconfig +system-wlroots X" + +DEPEND=" + dev-libs/libinput:= + dev-libs/wayland + 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(+)] + x11-libs/libxkbcommon[X?] + x11-libs/pango + x11-libs/pixman + X? ( + x11-base/xwayland + x11-libs/libxcb + ) + system-wfconfig? ( + >=gui-libs/wf-config-0.7.1 + =gui-libs/wlroots-0.16.0:0/16[X?] + ) + !system-wlroots? ( !gui-libs/wlroots ) +" + +RDEPEND=" + ${DEPEND} + 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) + $(usex debug --buildtype=debug "") + $(usex debug -Db_sanitize=address,undefined "") + ) + + # Clang will fail to link without this + tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") ) + + meson_src_configure +} + +src_install() { + meson_src_install + dobin "${T}"/wayfire-session + + insinto "/usr/share/wayland-sessions/" + insopts -m644 + doins wayfire.desktop + doins "${T}"/wayfire-session.desktop + + 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/wayfire/wayfire.ini\"" + elog "To install the file execute" + elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini" + fi +}
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 6b705c1f561a5faebe37b8dcd7dfbf067a48b43d Author: Sam James gentoo org> AuthorDate: Mon Feb 13 00:35:13 2023 + Commit: Sam James gentoo org> CommitDate: Mon Feb 13 00:39:05 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b705c1f gui-wm/wayfire: EAPI 8, sync live Closes: https://bugs.gentoo.org/884055 Signed-off-by: Sam James gentoo.org> gui-wm/wayfire/wayfire-0.7.5.ebuild | 32 gui-wm/wayfire/wayfire-.ebuild | 49 + 2 files changed, 55 insertions(+), 26 deletions(-) diff --git a/gui-wm/wayfire/wayfire-0.7.5.ebuild b/gui-wm/wayfire/wayfire-0.7.5.ebuild index df69e38f7f8c..42ab1b20d21d 100644 --- a/gui-wm/wayfire/wayfire-0.7.5.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.5.ebuild @@ -1,7 +1,7 @@ # Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson toolchain-funcs @@ -40,17 +40,29 @@ DEPEND=" x11-base/xwayland x11-libs/libxcb ) - system-wfconfig? ( - >=gui-libs/wf-config-0.7.1 - =gui-libs/wlroots-0.16.0:0/16[X?] - ) - !system-wlroots? ( !gui-libs/wlroots ) " +if [[ ${PV} == ]] ; then + DEPEND+=" + system-wfconfig? ( ~gui-libs/wf-config-:= ) + !system-wfconfig? ( !gui-libs/wf-config ) + system-wlroots? ( ~gui-libs/wlroots-:=[X?] ) + !system-wlroots? ( !gui-libs/wlroots ) + " +else + DEPEND+=" + system-wfconfig? ( + >=gui-libs/wf-config-0.7.1 + =gui-libs/wlroots-0.16.0:0/16[X?] + ) + !system-wlroots? ( !gui-libs/wlroots ) + " +fi + RDEPEND=" ${DEPEND} x11-misc/xkeyboard-config diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-.ebuild index c0233c805c44..42ab1b20d21d 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-.ebuild @@ -1,7 +1,7 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson toolchain-funcs @@ -21,31 +21,48 @@ SLOT="0" IUSE="debug +gles +system-wfconfig +system-wlroots X" DEPEND=" - dev-libs/libevdev - dev-libs/libinput + dev-libs/libinput:= dev-libs/wayland 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/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/cairo[X?,svg(+)] + x11-libs/libxkbcommon[X?] + x11-libs/pango x11-libs/pixman X? ( - x11-libs/libxcb x11-base/xwayland + x11-libs/libxcb ) - system-wfconfig? ( ~gui-libs/wf-config-:= ) - !system-wfconfig? ( !gui-libs/wf-config ) - system-wlroots? ( ~gui-libs/wlroots-:=[X?] ) - !system-wlroots? ( !gui-libs/wlroots ) " +if [[ ${PV} == ]] ; then + DEPEND+=" + system-wfconfig? ( ~gui-libs/wf-config-:= ) + !system-wfconfig? ( !gui-libs/wf-config ) + system-wlroots? ( ~gui-libs/wlroots-:=[X?] ) + !system-wlroots? ( !gui-libs/wlroots ) + " +else + DEPEND+=" + system-wfconfig? ( + >=gui-libs/wf-config-0.7.1 + =gui-libs/wlroots-0.16.0:0/16[X?] + ) + !system-wlroots? ( !gui-libs/wlroots ) + " +fi + RDEPEND=" ${DEPEND} x11-misc/xkeyboard-config @@ -58,9 +75,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) @@ -95,6 +112,6 @@ pkg_postinst() { elog "until you install a configuration file. The default config" elog "file is installed at \"/usr/share/wayfire/wayfire.ini\"" elog "To install the file execute" - elog "\$ cp /usr/share/wayfire.ini ~/.config/wayfire.ini" + elog "\$ cp
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: f38f2343fae0d25c521f015ba24c6f95bd44c484 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 18 19:28:46 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 18 19:28:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f38f2343 gui-wm/wayfire: Stabilize 0.7.3-r3 amd64, #886731 Signed-off-by: Arthur Zamarin gentoo.org> gui-wm/wayfire/wayfire-0.7.3-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-wm/wayfire/wayfire-0.7.3-r3.ebuild b/gui-wm/wayfire/wayfire-0.7.3-r3.ebuild index 29f736e0357a..11c7657d676e 100644 --- a/gui-wm/wayfire/wayfire-0.7.3-r3.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.3-r3.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; 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 ~riscv ~x86" + KEYWORDS="amd64 ~arm64 ~riscv ~x86" fi LICENSE="MIT"
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: cb18ef3f7e2a1460f1f9e2704d87e1e9b41bb48f Author: Sam James gentoo org> AuthorDate: Sat Oct 8 18:23:56 2022 + Commit: Sam James gentoo org> CommitDate: Sat Oct 8 18:25:06 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb18ef3f gui-wm/wayfire: fix MissingUseDepDefault on cairo Closes: https://bugs.gentoo.org/875929 Signed-off-by: Sam James gentoo.org> gui-wm/wayfire/{wayfire-0.7.2.ebuild => wayfire-0.7.2-r1.ebuild}| 4 ++-- gui-wm/wayfire/{wayfire-0.7.3.ebuild => wayfire-0.7.3-r2.ebuild}| 4 ++-- gui-wm/wayfire/{wayfire-0.7.3-r1.ebuild => wayfire-0.7.3-r3.ebuild} | 2 +- gui-wm/wayfire/wayfire-.ebuild | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gui-wm/wayfire/wayfire-0.7.2.ebuild b/gui-wm/wayfire/wayfire-0.7.2-r1.ebuild similarity index 97% rename from gui-wm/wayfire/wayfire-0.7.2.ebuild rename to gui-wm/wayfire/wayfire-0.7.2-r1.ebuild index 626f58c246e6..1a57d10a0023 100644 --- a/gui-wm/wayfire/wayfire-0.7.2.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,7 +33,7 @@ DEPEND=" media-libs/freetype:=[X?] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X?] - x11-libs/cairo:=[X?,svg] + x11-libs/cairo:=[X?,svg(+)] x11-libs/libxkbcommon:=[X?] x11-libs/pixman X? ( diff --git a/gui-wm/wayfire/wayfire-0.7.3.ebuild b/gui-wm/wayfire/wayfire-0.7.3-r2.ebuild similarity index 97% rename from gui-wm/wayfire/wayfire-0.7.3.ebuild rename to gui-wm/wayfire/wayfire-0.7.3-r2.ebuild index 61441848b801..7caf04ae818a 100644 --- a/gui-wm/wayfire/wayfire-0.7.3.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -32,7 +32,7 @@ DEPEND=" media-libs/freetype:=[X?] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X?] - x11-libs/cairo[X?,svg] + x11-libs/cairo[X?,svg(+)] x11-libs/libxkbcommon[X?] x11-libs/pango x11-libs/pixman diff --git a/gui-wm/wayfire/wayfire-0.7.3-r1.ebuild b/gui-wm/wayfire/wayfire-0.7.3-r3.ebuild similarity index 98% rename from gui-wm/wayfire/wayfire-0.7.3-r1.ebuild rename to gui-wm/wayfire/wayfire-0.7.3-r3.ebuild index c08e5cc1021f..29f736e0357a 100644 --- a/gui-wm/wayfire/wayfire-0.7.3-r1.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.3-r3.ebuild @@ -32,7 +32,7 @@ DEPEND=" media-libs/freetype:=[X?] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X?] - x11-libs/cairo[X?,svg] + x11-libs/cairo[X?,svg(+)] x11-libs/libxkbcommon[X?] x11-libs/pango x11-libs/pixman diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-.ebuild index 440b7f5772c3..c0233c805c44 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,7 +33,7 @@ DEPEND=" media-libs/freetype:=[X?] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X?] - x11-libs/cairo:=[X?,svg] + x11-libs/cairo:=[X?,svg(+)] x11-libs/libxkbcommon:=[X?] x11-libs/pixman X? (
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 35e9d198fddb7cef408befe8f85395e169fffcd5 Author: Sam James gentoo org> AuthorDate: Wed Jul 20 21:05:54 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jul 20 21:05:54 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e9d198 gui-wm/wayfire: crank up wlroots dep Closes: https://bugs.gentoo.org/859487 Signed-off-by: Sam James gentoo.org> gui-wm/wayfire/wayfire-0.7.3-r1.ebuild | 105 + 1 file changed, 105 insertions(+) diff --git a/gui-wm/wayfire/wayfire-0.7.3-r1.ebuild b/gui-wm/wayfire/wayfire-0.7.3-r1.ebuild new file mode 100644 index ..c08e5cc1021f --- /dev/null +++ b/gui-wm/wayfire/wayfire-0.7.3-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson toolchain-funcs + +DESCRIPTION="compiz like 3D wayland compositor" +HOMEPAGE="https://github.com/WayfireWM/wayfire; + +if [[ ${PV} == ]]; then + inherit git-r3 + 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 ~riscv ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="debug +gles +system-wfconfig +system-wlroots X" + +DEPEND=" + dev-libs/libinput:= + dev-libs/wayland + 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] + x11-libs/libxkbcommon[X?] + x11-libs/pango + x11-libs/pixman + X? ( + x11-base/xwayland + x11-libs/libxcb + ) + system-wfconfig? ( + >=gui-libs/wf-config-0.7.1 + =gui-libs/wlroots-0.15.1:0/15[X?] + ) + !system-wlroots? ( !gui-libs/wlroots ) +" + +RDEPEND=" + ${DEPEND} + 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) + $(usex debug --buildtype=debug "") + $(usex debug -Db_sanitize=address,undefined "") + ) + + # Clang will fail to link without this + tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") ) + + meson_src_configure +} + +src_install() { + meson_src_install + dobin "${T}"/wayfire-session + + insinto "/usr/share/wayland-sessions/" + insopts -m644 + doins wayfire.desktop + doins "${T}"/wayfire-session.desktop + + 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/wayfire/wayfire.ini\"" + elog "To install the file execute" + elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini" + fi +}
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 043e5f8bbc1910d4188cf2d1937fcc378e39f275 Author: Marc Cramer posteo net> AuthorDate: Sun Jun 26 21:20:27 2022 + Commit: Sam James gentoo org> CommitDate: Sun Jul 10 21:53:56 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=043e5f8b gui-wm/wayfire: bump to 0.7.3 Closes: https://bugs.gentoo.org/840978 Signed-off-by: Marc Cramer posteo.net> Signed-off-by: Sam James gentoo.org> gui-wm/wayfire/Manifest | 1 + gui-wm/wayfire/wayfire-0.7.3.ebuild | 105 2 files changed, 106 insertions(+) diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index c664604cabb1..a4fbcb4bfefe 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1 +1,2 @@ DIST wayfire-0.7.2.tar.xz 753132 BLAKE2B 0873ff9937cdc7cc63af2c2c365c7e3eed9c0784ab0777e88de9aa373316e9bb1c87a10651d8526577e3da32e402e4d8f6db68d32bc4fcf5513f526751f76829 SHA512 e1321605dbae2b9769a54aaacb0e4a4259b1e2ab4304e8a8c1257f7033b2d740b0632053309e75e04f7b6d2bdf6d68dcebad6950fd914c3052b19bc58e24 +DIST wayfire-0.7.3.tar.xz 765524 BLAKE2B b82c66796d7fb3d07c7bd9078755b7c38df1bd5c93daa659fc98b1182679bc0a06a24b322c6ab492d06d30c898659e2ba849c1d5944260e8775a04fd8a5bd078 SHA512 7bb5b8492a632a9816e847ec72def74dc234bcc30da7c320a0cd3b1d60492f5521ad8ac76a12ef967d1b114bcde9be72eb8ffc618977aed8e198d4ace1e7056e diff --git a/gui-wm/wayfire/wayfire-0.7.3.ebuild b/gui-wm/wayfire/wayfire-0.7.3.ebuild new file mode 100644 index ..61441848b801 --- /dev/null +++ b/gui-wm/wayfire/wayfire-0.7.3.ebuild @@ -0,0 +1,105 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson toolchain-funcs + +DESCRIPTION="compiz like 3D wayland compositor" +HOMEPAGE="https://github.com/WayfireWM/wayfire; + +if [[ ${PV} == ]]; then + inherit git-r3 + 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 ~riscv ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="debug +gles +system-wfconfig +system-wlroots X" + +DEPEND=" + dev-libs/libinput:= + dev-libs/wayland + 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] + x11-libs/libxkbcommon[X?] + x11-libs/pango + x11-libs/pixman + X? ( + x11-base/xwayland + x11-libs/libxcb + ) + system-wfconfig? ( + >=gui-libs/wf-config-0.7.1 +"${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) + $(usex debug --buildtype=debug "") + $(usex debug -Db_sanitize=address,undefined "") + ) + + # Clang will fail to link without this + tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") ) + + meson_src_configure +} + +src_install() { + meson_src_install + dobin "${T}"/wayfire-session + + insinto "/usr/share/wayland-sessions/" + insopts -m644 + doins wayfire.desktop + doins "${T}"/wayfire-session.desktop + + 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/wayfire/wayfire.ini\"" + elog "To install the file execute" + elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini" + fi +}
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 0088c608826a9ee359815bff9e47201f4a4b8dff Author: yemou Hannam tuta io> AuthorDate: Fri Oct 22 02:34:17 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Nov 10 07:50:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0088c608 gui-wm/wayfire: add debug useflag Build wayfire with asan as suggested by upstream for debugging crashes. Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: yemou Hannam tuta.io> Closes: https://github.com/gentoo/gentoo/pull/22665 Signed-off-by: Joonas Niilola gentoo.org> gui-wm/wayfire/wayfire-0.7.2.ebuild | 10 -- gui-wm/wayfire/wayfire-.ebuild | 10 -- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/gui-wm/wayfire/wayfire-0.7.2.ebuild b/gui-wm/wayfire/wayfire-0.7.2.ebuild index eca2999b571..50b70ce184d 100644 --- a/gui-wm/wayfire/wayfire-0.7.2.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit meson +inherit meson toolchain-funcs DESCRIPTION="compiz like 3D wayland compositor" HOMEPAGE="https://github.com/WayfireWM/wayfire; @@ -18,7 +18,7 @@ fi LICENSE="MIT" SLOT="0" -IUSE="+gles +system-wfconfig +system-wlroots X" +IUSE="debug +gles +system-wfconfig +system-wlroots X" DEPEND=" dev-libs/libevdev @@ -71,7 +71,13 @@ src_configure() { $(meson_feature system-wlroots use_system_wlroots) $(meson_feature X xwayland) $(meson_use gles enable_gles32) + $(usex debug --buildtype=debug "") + $(usex debug -Db_sanitize=address,undefined "") ) + + # Clang will fail to link without this + tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") ) + meson_src_configure } diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-.ebuild index 8c86b4aadda..aa79e894749 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit meson +inherit meson toolchain-funcs DESCRIPTION="compiz like 3D wayland compositor" HOMEPAGE="https://github.com/WayfireWM/wayfire; @@ -18,7 +18,7 @@ fi LICENSE="MIT" SLOT="0" -IUSE="+gles +system-wfconfig +system-wlroots X" +IUSE="debug +gles +system-wfconfig +system-wlroots X" DEPEND=" dev-libs/libevdev @@ -65,7 +65,13 @@ src_configure() { $(meson_feature system-wlroots use_system_wlroots) $(meson_feature X xwayland) $(meson_use gles enable_gles32) + $(usex debug --buildtype=debug "") + $(usex debug -Db_sanitize=address,undefined "") ) + + # Clang will fail to link without this + tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") ) + meson_src_configure }
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: d40a0bfa0f1fa774f9a683524e4eaa271d3cd9b4 Author: Joonas Niilola gentoo org> AuthorDate: Wed Nov 10 07:33:00 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Nov 10 07:50:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d40a0bfa gui-wm/wayfire: depend on dev-libs/wayland Signed-off-by: Joonas Niilola gentoo.org> gui-wm/wayfire/wayfire-0.7.2.ebuild | 1 + gui-wm/wayfire/wayfire-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/gui-wm/wayfire/wayfire-0.7.2.ebuild b/gui-wm/wayfire/wayfire-0.7.2.ebuild index 50b70ce184d..626f58c246e 100644 --- a/gui-wm/wayfire/wayfire-0.7.2.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.2.ebuild @@ -23,6 +23,7 @@ IUSE="debug +gles +system-wfconfig +system-wlroots X" DEPEND=" dev-libs/libevdev dev-libs/libinput + dev-libs/wayland gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,X?] diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-.ebuild index aa79e894749..440b7f5772c 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-.ebuild @@ -23,6 +23,7 @@ IUSE="debug +gles +system-wfconfig +system-wlroots X" DEPEND=" dev-libs/libevdev dev-libs/libinput + dev-libs/wayland gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,X?]
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: f3d879fe32139097f6dceb3b3e7f427c1f76b7da Author: Stijn Tintel linux-ipv6 be> AuthorDate: Sat Sep 18 11:16:14 2021 + Commit: Yixun Lan gentoo org> CommitDate: Sat Sep 18 14:40:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3d879fe gui-wm/wayfire: keyword 0.7.2 for ~riscv Closes: https://github.com/gentoo/gentoo/pull/22322 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Stijn Tintel linux-ipv6.be> Signed-off-by: Yixun Lan gentoo.org> gui-wm/wayfire/wayfire-0.7.2.ebuild | 2 +- gui-wm/wayfire/wayfire-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui-wm/wayfire/wayfire-0.7.2.ebuild b/gui-wm/wayfire/wayfire-0.7.2.ebuild index 91bd59b30f0..eca2999b571 100644 --- a/gui-wm/wayfire/wayfire-0.7.2.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.2.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; 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" diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-.ebuild index 01dc7698d0f..8c86b4aadda 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; 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"
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 7e35988a35739fbdbecb3dc6a8bc124da96f0f46 Author: Joonas Niilola gentoo org> AuthorDate: Mon Sep 13 07:27:22 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Sep 13 07:28:09 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e35988a gui-wm/wayfire: drop 0.7.1 Signed-off-by: Joonas Niilola gentoo.org> gui-wm/wayfire/Manifest | 1 - gui-wm/wayfire/wayfire-0.7.1.ebuild | 104 2 files changed, 105 deletions(-) diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index e4b06b94642..c664604cabb 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1,2 +1 @@ -DIST wayfire-0.7.1.tar.xz 753104 BLAKE2B e26b5e770fff44ef04a9d832ed404f05d37448c8ecc0be1e976b8bd0866c2716150bc43394fc4d2fbba1854696eaf54f16dabc632b686f236e66313d0d1eaf59 SHA512 c045ed16d2eb24b508f84d6616021638ec139b99618f5cb834f2b3675d1e549a6cc1bc3150dd97965a16a2a23fe54abe34e4671ce345350a7fb4084f13d7e969 DIST wayfire-0.7.2.tar.xz 753132 BLAKE2B 0873ff9937cdc7cc63af2c2c365c7e3eed9c0784ab0777e88de9aa373316e9bb1c87a10651d8526577e3da32e402e4d8f6db68d32bc4fcf5513f526751f76829 SHA512 e1321605dbae2b9769a54aaacb0e4a4259b1e2ab4304e8a8c1257f7033b2d740b0632053309e75e04f7b6d2bdf6d68dcebad6950fd914c3052b19bc58e24 diff --git a/gui-wm/wayfire/wayfire-0.7.1.ebuild b/gui-wm/wayfire/wayfire-0.7.1.ebuild deleted file mode 100644 index 10e6172e29c..000 --- a/gui-wm/wayfire/wayfire-0.7.1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 2019-2021 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} == ]]; then - inherit git-r3 - 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" -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-0.7.1 - =gui-libs/wlroots-0.13.0:=[elogind=,systemd=,X?] -"${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 -}
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 8c84e1af45c9d0453867347c74706ea422c0d2b3 Author: Joonas Niilola gentoo org> AuthorDate: Mon Sep 13 07:26:50 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Sep 13 07:28:08 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c84e1af gui-wm/wayfire: stabilize 0.7.2 for amd64 Closes: https://bugs.gentoo.org/811888 Signed-off-by: Joonas Niilola gentoo.org> gui-wm/wayfire/wayfire-0.7.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-wm/wayfire/wayfire-0.7.2.ebuild b/gui-wm/wayfire/wayfire-0.7.2.ebuild index 15d00602b19..91bd59b30f0 100644 --- a/gui-wm/wayfire/wayfire-0.7.2.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.2.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; 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 ~x86" fi LICENSE="MIT"
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 2d44632fa830ebb984ab52f6afe8ab1734e51f8f Author: Joonas Niilola gentoo org> AuthorDate: Mon Sep 13 07:26:05 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Sep 13 07:28:08 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d44632f gui-wm/wayfire: add X? ( x11-base/xwayland ) dep Bug: https://bugs.gentoo.org/811888 Signed-off-by: Joonas Niilola gentoo.org> gui-wm/wayfire/wayfire-0.7.2.ebuild | 5 - gui-wm/wayfire/wayfire-.ebuild | 9 ++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gui-wm/wayfire/wayfire-0.7.2.ebuild b/gui-wm/wayfire/wayfire-0.7.2.ebuild index f0a550b499d..15d00602b19 100644 --- a/gui-wm/wayfire/wayfire-0.7.2.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.2.ebuild @@ -35,7 +35,10 @@ DEPEND=" x11-libs/cairo:=[X?,svg] x11-libs/libxkbcommon:=[X?] x11-libs/pixman - X? ( x11-libs/libxcb ) + X? ( + x11-base/xwayland + x11-libs/libxcb + ) system-wfconfig? ( >=gui-libs/wf-config-0.7.1 "${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)
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: d4668d10d8452c5652795207d42145ca073ad920 Author: Sam James gentoo org> AuthorDate: Mon Sep 6 22:22:53 2021 + Commit: Sam James gentoo org> CommitDate: Mon Sep 6 22:23:17 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4668d10 gui-wm/wayfire: fix pkg_postinst message (config location) No point revbumping as it's for first-time installs only. Reported-by: catbeard Signed-off-by: Sam James gentoo.org> gui-wm/wayfire/wayfire-0.7.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-wm/wayfire/wayfire-0.7.2.ebuild b/gui-wm/wayfire/wayfire-0.7.2.ebuild index b707ccebc23..f0a550b499d 100644 --- a/gui-wm/wayfire/wayfire-0.7.2.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.2.ebuild @@ -91,6 +91,6 @@ pkg_postinst() { elog "until you install a configuration file. The default config" elog "file is installed at \"/usr/share/wayfire/wayfire.ini\"" elog "To install the file execute" - elog "\$ cp /usr/share/wayfire.ini ~/.config/wayfire.ini" + elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini" fi }
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 5aa7ccf7f654e6190c1b2c20a729c5f458f1ee97 Author: Sam James gentoo org> AuthorDate: Mon Sep 6 19:34:47 2021 + Commit: Sam James gentoo org> CommitDate: Mon Sep 6 21:08:26 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aa7ccf7 gui-wm/wayfire: add 0.7.2 Signed-off-by: Sam James gentoo.org> gui-wm/wayfire/Manifest | 1 + gui-wm/wayfire/wayfire-0.7.2.ebuild | 96 + 2 files changed, 97 insertions(+) diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index 5454f153084..e4b06b94642 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1 +1,2 @@ DIST wayfire-0.7.1.tar.xz 753104 BLAKE2B e26b5e770fff44ef04a9d832ed404f05d37448c8ecc0be1e976b8bd0866c2716150bc43394fc4d2fbba1854696eaf54f16dabc632b686f236e66313d0d1eaf59 SHA512 c045ed16d2eb24b508f84d6616021638ec139b99618f5cb834f2b3675d1e549a6cc1bc3150dd97965a16a2a23fe54abe34e4671ce345350a7fb4084f13d7e969 +DIST wayfire-0.7.2.tar.xz 753132 BLAKE2B 0873ff9937cdc7cc63af2c2c365c7e3eed9c0784ab0777e88de9aa373316e9bb1c87a10651d8526577e3da32e402e4d8f6db68d32bc4fcf5513f526751f76829 SHA512 e1321605dbae2b9769a54aaacb0e4a4259b1e2ab4304e8a8c1257f7033b2d740b0632053309e75e04f7b6d2bdf6d68dcebad6950fd914c3052b19bc58e24 diff --git a/gui-wm/wayfire/wayfire-0.7.2.ebuild b/gui-wm/wayfire/wayfire-0.7.2.ebuild new file mode 100644 index 000..b707ccebc23 --- /dev/null +++ b/gui-wm/wayfire/wayfire-0.7.2.ebuild @@ -0,0 +1,96 @@ +# Copyright 2019-2021 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} == ]]; then + inherit git-r3 + 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" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="+gles +system-wfconfig +system-wlroots X" + +DEPEND=" + dev-libs/libevdev + dev-libs/libinput + 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] + x11-libs/libxkbcommon:=[X?] + x11-libs/pixman + X? ( x11-libs/libxcb ) + system-wfconfig? ( + >=gui-libs/wf-config-0.7.1 + =gui-libs/wlroots-0.14.0:=[X?] +"${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() { + meson_src_install + dobin "${T}"/wayfire-session + + insinto "/usr/share/wayland-sessions/" + insopts -m644 + doins wayfire.desktop + doins "${T}"/wayfire-session.desktop + + 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/wayfire/wayfire.ini\"" + elog "To install the file execute" + elog "\$ cp /usr/share/wayfire.ini ~/.config/wayfire.ini" + fi +}
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: cc6654af39bc1fc9994abf8590d5ab147e767fc9 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Jun 18 06:26:29 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Jun 18 06:26:29 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc6654af gui-wm/wayfire: amd64 stable wrt bug #771246 Package-Manager: Portage-3.0.18, Repoman-3.0.2 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> gui-wm/wayfire/wayfire-0.7.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-wm/wayfire/wayfire-0.7.1.ebuild b/gui-wm/wayfire/wayfire-0.7.1.ebuild index e5889895cfa..10e6172e29c 100644 --- a/gui-wm/wayfire/wayfire-0.7.1.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; 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 ~x86" fi LICENSE="MIT"
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/, gui-libs/wf-config/
commit: a4c7fc294656996bf54277b97d6e08b54985723a Author: Aisha Tammy bsd ac> AuthorDate: Sun May 16 16:36:55 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Jun 3 12:45:16 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c7fc29 gui-wm/wayfire: version bump to 0.7.1 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Aisha Tammy aisha.cc> Signed-off-by: Joonas Niilola gentoo.org> gui-libs/wf-config/Manifest | 1 + gui-libs/wf-config/wf-config-0.7.1.ebuild | 35 ++ gui-wm/wayfire/Manifest | 3 +- gui-wm/wayfire/wayfire-0.7.1.ebuild | 104 ++ 4 files changed, 142 insertions(+), 1 deletion(-) diff --git a/gui-libs/wf-config/Manifest b/gui-libs/wf-config/Manifest index 345490fae33..870e06de384 100644 --- a/gui-libs/wf-config/Manifest +++ b/gui-libs/wf-config/Manifest @@ -1,2 +1,3 @@ DIST wf-config-0.5.0.tar.xz 64760 BLAKE2B c1939035820794828b356371c51dbd55a73a569e3a9dcf801b4aedf61c3c0131e47040a1b05e2a8cd30ecbb57f160f702b735437dfb49051a8a6a63d95201204 SHA512 b365884195cb7fc64a1ca1d74a2d12b56e1ef0f4dd49d298a9379455f2917f2c644de2b12f5068304ca404b112490e38fbfe3111aac31d301f02f23429df87c7 +DIST wf-config-0.7.0.tar.xz 73332 BLAKE2B 709a9358e564538b9db8536a5e24f2e7843498830e643ed005801624de9f71ad2661824de75f5b57541ece99d525a4689048c990df5ddc3fdcee6fc83c03e490 SHA512 ddad687b180e786060839cafe5623a0897ade061e6ad057dbe579d51595fbf2dc45674df3fb35070520dc51d7e02d4c9158d9cf8d4619ac49334014f6701f06d DIST wf-config-0.7.1.tar.xz 39120 BLAKE2B b18048334df12b002391fe4a74529cb61df76a0678c9052f8ac91d777e8a48dae46b87680fb44630ebfb9a350dbac36b15bc81850341fa4cd6299c12f6fa057d SHA512 d535a09a3465a54a607df7b8764ee6818ab8b83536d68c85167b282b95a176636e4bf5cda6c0d1638c07721a1f4208203e9d41b83675038fb590a535314df719 diff --git a/gui-libs/wf-config/wf-config-0.7.1.ebuild b/gui-libs/wf-config/wf-config-0.7.1.ebuild new file mode 100644 index 000..6b7ee7b7628 --- /dev/null +++ b/gui-libs/wf-config/wf-config-0.7.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +DESCRIPTION="library for managing wayfire configuration files" +HOMEPAGE="https://github.com/WayfireWM/wf-config; + +if [[ ${PV} == ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/WayfireWM/wf-config.git; +else + SRC_URI="https://github.com/WayfireWM/wf-config/releases/download/v${PV}/${P}.tar.xz; + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +DEPEND=" + dev-libs/libevdev + dev-libs/libxml2 + >=gui-libs/wlroots-0.13.0:= + https://github.com/WayfireWM/wayfire; + +if [[ ${PV} == ]]; then + inherit git-r3 + 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" +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-0.7.1 + =gui-libs/wlroots-0.13.0:=[elogind=,systemd=,X?] +"${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
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 78cd57b5bcec438e01ab64e5aa379d07a6c83410 Author: Aisha Tammy aisha cc> AuthorDate: Sat Jan 30 03:09:14 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Feb 10 13:36:00 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78cd57b5 gui-wm/wayfire: version bump to 0.7.0 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Aisha Tammy aisha.cc> Signed-off-by: Joonas Niilola gentoo.org> gui-wm/wayfire/Manifest | 1 + gui-wm/wayfire/{wayfire-.ebuild => wayfire-0.7.0.ebuild} | 4 ++-- gui-wm/wayfire/wayfire-.ebuild | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index f705f3f3043..5d3e75680ef 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1,2 +1,3 @@ DIST wayfire-0.5.0.tar.xz 670680 BLAKE2B 6a1555669352dd1303f7472db4fbb8ada6173c09825f4e999a2862787bd5bf31e070e9e12110249b9407d8c380235f4a9d3c5be6b23defe36094822526eed6ef SHA512 9c2d116a5d6e77e37b0e4eef26624d43d6ab3a80e56e19a2de1fdd28a2a522c24b9e346eb4529848f3b2c3668460a51f428a0c196286ec8300e4823250eae811 DIST wayfire-0.6.0.tar.xz 701084 BLAKE2B 3ee0274c706aaa4690e9eb9617d2f272dd1e6573529c40b43d3fd05e79a4ddceef8dec34a7d2363aff8603fb3fd7490c4d2e79e67bff825a3bb68cc8090ad301 SHA512 dc6b5378dc51352ab41ac3c5713e73f341caa2a119a91826818b0a7cde629e63ce855a4376b5c60b468717336dda4806fb1195d534cd7ab2e5d6285c8075102e +DIST wayfire-0.7.0.tar.xz 735756 BLAKE2B 8298cc92938f5196e3dc5bac39d4d9db370e69209461feb5d7abe685e0277efd4bd42ef2c18dc41d79e20d794dae5889efec56f8278fde6efc37b8017c5e65ea SHA512 eaaa193619a6cb0c7a0879aa24a7f6d468e81aeef0b9f17a282f5f930c00557a021f4d45de4aae6f57ce5e427148387c3fdf344ea9c6843a75e777b96f79 diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-0.7.0.ebuild similarity index 95% copy from gui-wm/wayfire/wayfire-.ebuild copy to gui-wm/wayfire/wayfire-0.7.0.ebuild index 96f551ce51c..339de620d25 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ if [[ ${PV} == ]]; 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; + SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz; KEYWORDS="~amd64 ~arm64 ~x86" fi diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-.ebuild index 96f551ce51c..339de620d25 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ if [[ ${PV} == ]]; 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; + SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz; KEYWORDS="~amd64 ~arm64 ~x86" fi
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 0dc7802fd115aa39ec11f67b64f1c0cbd14a8dc2 Author: Sam James gentoo org> AuthorDate: Wed Nov 18 16:25:09 2020 + Commit: Sam James gentoo org> CommitDate: Wed Nov 18 16:25:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dc7802f gui-wm/wayfire: Stabilize 0.5.0 amd64, #752024 Signed-off-by: Sam James gentoo.org> gui-wm/wayfire/wayfire-0.5.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-wm/wayfire/wayfire-0.5.0.ebuild b/gui-wm/wayfire/wayfire-0.5.0.ebuild index f2df4accbaa..5b1a4cb2d81 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} == ]]; 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"
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/files/, gui-wm/wayfire/
commit: 1288241272bb563ed94e18d7003d8e9463903d62 Author: Aisha Tammy aisha cc> AuthorDate: Tue Nov 10 20:31:43 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Nov 13 21:04:12 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12882412 gui-wm/wayfire: version bump to 0.6.0 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Aisha Tammy aisha.cc> Signed-off-by: Aaron Bauman gentoo.org> gui-wm/wayfire/Manifest | 1 + gui-wm/wayfire/files/wayfire-session| 17 + gui-wm/wayfire/files/wayfire-session.desktop| 7 +++ .../{wayfire-.ebuild => wayfire-0.6.0.ebuild} | 10 -- gui-wm/wayfire/wayfire-.ebuild | 10 -- 5 files changed, 41 insertions(+), 4 deletions(-) diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index 66ae5e3cf95..f705f3f3043 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1 +1,2 @@ DIST wayfire-0.5.0.tar.xz 670680 BLAKE2B 6a1555669352dd1303f7472db4fbb8ada6173c09825f4e999a2862787bd5bf31e070e9e12110249b9407d8c380235f4a9d3c5be6b23defe36094822526eed6ef SHA512 9c2d116a5d6e77e37b0e4eef26624d43d6ab3a80e56e19a2de1fdd28a2a522c24b9e346eb4529848f3b2c3668460a51f428a0c196286ec8300e4823250eae811 +DIST wayfire-0.6.0.tar.xz 701084 BLAKE2B 3ee0274c706aaa4690e9eb9617d2f272dd1e6573529c40b43d3fd05e79a4ddceef8dec34a7d2363aff8603fb3fd7490c4d2e79e67bff825a3bb68cc8090ad301 SHA512 dc6b5378dc51352ab41ac3c5713e73f341caa2a119a91826818b0a7cde629e63ce855a4376b5c60b468717336dda4806fb1195d534cd7ab2e5d6285c8075102e diff --git a/gui-wm/wayfire/files/wayfire-session b/gui-wm/wayfire/files/wayfire-session new file mode 100644 index 000..8267ea0e11f --- /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 000..1088c4e0b79 --- /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-.ebuild b/gui-wm/wayfire/wayfire-0.6.0.ebuild similarity index 83% copy from gui-wm/wayfire/wayfire-.ebuild copy to gui-wm/wayfire/wayfire-0.6.0.ebuild index f2df4accbaa..96f551ce51c 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-0.6.0.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 diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-.ebuild index f2df4accbaa..96f551ce51c 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-.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? (
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 205548ee83fdb69b8e3a90b0f847e69c8b7cc5f9 Author: Aaron Bauman gentoo org> AuthorDate: Mon Nov 9 16:34:35 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Mon Nov 9 16:35:13 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=205548ee gui-wm/wayfire: drop old * Drop old at request of maintainer Signed-off-by: Aaron Bauman gentoo.org> gui-wm/wayfire/Manifest| 1 - gui-wm/wayfire/wayfire-0.4.0-r2.ebuild | 92 -- 2 files changed, 93 deletions(-) diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index cbc0a80a9bc..66ae5e3cf95 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1,2 +1 @@ -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.4.0-r2.ebuild b/gui-wm/wayfire/wayfire-0.4.0-r2.ebuild deleted file mode 100644 index bf539ba4965..000 --- 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} == ]]; 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 -}
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: c685f0536fa2c041527be681eb93800c8afbde77 Author: Aisha Tammy aisha cc> AuthorDate: Wed Aug 5 09:41:20 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Mon Aug 17 01:36:06 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c685f053 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 aisha.cc> Signed-off-by: Aaron Bauman gentoo.org> gui-wm/wayfire/Manifest| 1 + .../{wayfire-.ebuild => wayfire-0.5.0.ebuild} | 26 +++--- gui-wm/wayfire/wayfire-.ebuild | 26 +++--- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index f03e463761b..cbc0a80a9bc 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-.ebuild b/gui-wm/wayfire/wayfire-0.5.0.ebuild similarity index 72% copy from gui-wm/wayfire/wayfire-.ebuild copy to gui-wm/wayfire/wayfire-0.5.0.ebuild index 3a3d136e62b..f2df4accbaa 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-0.5.0.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-[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 } diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-.ebuild index 3a3d136e62b..f2df4accbaa 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-.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] +
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: ca959c01707ccd90f0500fbc09ddb9a57b068161 Author: Aisha Tammy aisha cc> AuthorDate: Sun Jun 21 14:57:46 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 21 18:39:50 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca959c01 gui-wm/wayfire: fix version dependency on wf-config dependency has been unsrestricted as only one of the packages(wf-config) in the wayfire ecosystem has a new release to fix it with gcc-10. Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Aisha Tammy aisha.cc> Signed-off-by: Andreas Sturmlechner gentoo.org> gui-wm/wayfire/{wayfire-0.4.0-r1.ebuild => wayfire-0.4.0-r2.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-wm/wayfire/wayfire-0.4.0-r1.ebuild b/gui-wm/wayfire/wayfire-0.4.0-r2.ebuild similarity index 97% rename from gui-wm/wayfire/wayfire-0.4.0-r1.ebuild rename to gui-wm/wayfire/wayfire-0.4.0-r2.ebuild index 9de00654b84..bf539ba4965 100644 --- a/gui-wm/wayfire/wayfire-0.4.0-r1.ebuild +++ b/gui-wm/wayfire/wayfire-0.4.0-r2.ebuild @@ -36,7 +36,7 @@ DEPEND=" 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.10.1[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots )
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: ac6d97bb0b5d1f0cad586def0afe79733b540e3d Author: Aisha Tammy aisha cc> AuthorDate: Sat Jun 6 20:02:20 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Sun Jun 7 00:12:14 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6d97bb gui-wm/wayfire: remove debug symbols Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Aisha Tammy aisha.cc> Signed-off-by: Aaron Bauman gentoo.org> gui-wm/wayfire/metadata.xml | 3 +-- .../{wayfire-0.4.0.ebuild => wayfire-0.4.0-r1.ebuild} | 15 +-- gui-wm/wayfire/wayfire-.ebuild| 15 +-- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml index c61941f4b35..5765c019ed7 100644 --- a/gui-wm/wayfire/metadata.xml +++ b/gui-wm/wayfire/metadata.xml @@ -15,9 +15,8 @@ Proxy Maintainers -use libglvnd to do animations more efficiently +use libglvnd to do animations more efficiently use the system-wide wf-config, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING. use the system wide wlroots, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING. -add debugging symbols for error reporting. DISABLE ALL SYSTEM USE FLAGS BEFORE REPORTING BUGS. diff --git a/gui-wm/wayfire/wayfire-0.4.0.ebuild b/gui-wm/wayfire/wayfire-0.4.0-r1.ebuild similarity index 85% rename from gui-wm/wayfire/wayfire-0.4.0.ebuild rename to gui-wm/wayfire/wayfire-0.4.0-r1.ebuild index 960c7938036..9de00654b84 100644 --- a/gui-wm/wayfire/wayfire-0.4.0.ebuild +++ b/gui-wm/wayfire/wayfire-0.4.0-r1.ebuild @@ -18,7 +18,7 @@ fi LICENSE="MIT" SLOT="0" -IUSE="+gles2 +system-wfconfig +system-wlroots elogind systemd debug" +IUSE="+gles +system-wfconfig +system-wlroots elogind systemd" REQUIRED_USE="?? ( elogind systemd )" DEPEND=" @@ -35,10 +35,10 @@ DEPEND=" x11-libs/cairo:=[X,svg] x11-libs/libxkbcommon:=[X] x11-libs/pixman - gles2? ( media-libs/libglvnd[X] ) - system-wfconfig? ( ~gui-libs/wf-config-${PV}[debug=] ) + 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.0[elogind=,systemd=,X] ) + system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) " @@ -59,13 +59,8 @@ src_configure() { local emesonargs=( $(meson_feature system-wfconfig use_system_wfconfig) $(meson_feature system-wlroots use_system_wlroots) - $(meson_use gles2 enable_gles32) + $(meson_use gles enable_gles32) ) - if use debug; then - emesonargs+=( - "-Db_sanitize=address,undefined" - ) - fi meson_src_configure } diff --git a/gui-wm/wayfire/wayfire-.ebuild b/gui-wm/wayfire/wayfire-.ebuild index 2ca45c4a7e8..3a3d136e62b 100644 --- a/gui-wm/wayfire/wayfire-.ebuild +++ b/gui-wm/wayfire/wayfire-.ebuild @@ -18,7 +18,7 @@ fi LICENSE="MIT" SLOT="0" -IUSE="+gles2 +system-wfconfig +system-wlroots elogind systemd debug" +IUSE="+gles +system-wfconfig +system-wlroots elogind systemd" REQUIRED_USE="?? ( elogind systemd )" DEPEND=" @@ -35,10 +35,10 @@ DEPEND=" x11-libs/cairo:=[X,svg] x11-libs/libxkbcommon:=[X] x11-libs/pixman - gles2? ( media-libs/libglvnd[X] ) - system-wfconfig? ( ~gui-libs/wf-config-${PV}[debug=] ) + 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-[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) " @@ -59,13 +59,8 @@ src_configure() { local emesonargs=( $(meson_feature system-wfconfig use_system_wfconfig) $(meson_feature system-wlroots use_system_wlroots) - $(meson_use gles2 enable_gles32) + $(meson_use gles enable_gles32) ) - if use debug; then - emesonargs+=( - "-Db_sanitize=address,undefined" - ) - fi meson_src_configure }
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
commit: 72607ad00acb19416f8173803aa3767b4b4aeb62 Author: Aisha Tammy aisha cc> AuthorDate: Fri May 15 15:52:55 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Sun May 17 15:54:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72607ad0 gui-wm/wayfire: compiz like 3d wayland manager Closes: https://bugs.gentoo.org/686854 compiz like eye-candy 3D wayland, with low memory footprint. Aims to bring desktop features such as 3D cube, fire burn, fisheye, wrot and all other desktop effects to wayland. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Aisha Tammy aisha.cc> Signed-off-by: Aaron Bauman gentoo.org> gui-wm/wayfire/Manifest | 1 + gui-wm/wayfire/metadata.xml | 23 + gui-wm/wayfire/wayfire-0.4.0.ebuild | 97 + gui-wm/wayfire/wayfire-.ebuild | 97 + 4 files changed, 218 insertions(+) diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest new file mode 100644 index 000..f03e463761b --- /dev/null +++ b/gui-wm/wayfire/Manifest @@ -0,0 +1 @@ +DIST wayfire-0.4.0.tar.xz 588904 BLAKE2B b720297b3ffb868761ea61615b4d0fefc2687f8a2060208f8cc002ff7adaf7622da906ad98e25664c3e72c04de2fb74741d0a417cce4826483407bdf10d63b43 SHA512 e96cdb90ce36c005476e08608683983aa167e58aea80fcfd3b24ab0836ec4aa50fb5a7eeb0872a1b1014e3073ed826e1c83d3146b39d3cdb2a8b3a0895155649 diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml new file mode 100644 index 000..c61941f4b35 --- /dev/null +++ b/gui-wm/wayfire/metadata.xml @@ -0,0 +1,23 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + +compiz like eye-candy 3D wayland, with low memory footprint. +Aims to bring desktop features such as 3D cube, fire burn, +fisheye, wrot and all other desktop effects to wayland. + + +gen...@aisha.cc +Aisha Tammy + + +proxy-ma...@gentoo.org +Proxy Maintainers + + +use libglvnd to do animations more efficiently +use the system-wide wf-config, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING. +use the system wide wlroots, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING. +add debugging symbols for error reporting. DISABLE ALL SYSTEM USE FLAGS BEFORE REPORTING BUGS. + + diff --git a/gui-wm/wayfire/wayfire-0.4.0.ebuild b/gui-wm/wayfire/wayfire-0.4.0.ebuild new file mode 100644 index 000..96c6375e2b0 --- /dev/null +++ b/gui-wm/wayfire/wayfire-0.4.0.ebuild @@ -0,0 +1,97 @@ +# 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} == ]]; 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="+gles2 +system-wfconfig +system-wlroots elogind systemd debug" +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 + gles2? ( media-libs/libglvnd[X] ) + system-wfconfig? ( ~gui-libs/wf-config-${PV}[debug=] ) + !system-wfconfig? ( !gui-libs/wf-config ) + system-wlroots? ( >=gui-libs/wlroots-0.10.0[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_compile(){ + local emesonargs=( + $(meson_feature system-wfconfig use_system_wfconfig) + $(meson_feature system-wlroots use_system_wlroots) + $(meson_use gles2 enable_gles32) + ) + if use debug; then + emesonargs+=( + "-Db_sanitize=address,undefined" + ) + fi + meson_src_compile +} + +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 +