[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/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/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/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/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? (
