* [gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/files/, gui-wm/wayfire/
@ 2020-11-13 21:04 Aaron Bauman
0 siblings, 0 replies; 5+ messages in thread
From: Aaron Bauman @ 2020-11-13 21:04 UTC (permalink / raw
To: gentoo-commits
commit: 1288241272bb563ed94e18d7003d8e9463903d62
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Nov 10 20:31:43 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 21:04:12 2020 +0000
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 <gentoo <AT> aisha.cc>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
gui-wm/wayfire/Manifest | 1 +
gui-wm/wayfire/files/wayfire-session | 17 +++++++++++++++++
gui-wm/wayfire/files/wayfire-session.desktop | 7 +++++++
.../{wayfire-9999.ebuild => wayfire-0.6.0.ebuild} | 10 ++++++++--
gui-wm/wayfire/wayfire-9999.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 00000000000..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 00000000000..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-9999.ebuild b/gui-wm/wayfire/wayfire-0.6.0.ebuild
similarity index 83%
copy from gui-wm/wayfire/wayfire-9999.ebuild
copy to gui-wm/wayfire/wayfire-0.6.0.ebuild
index f2df4accbaa..96f551ce51c 100644
--- a/gui-wm/wayfire/wayfire-9999.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-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index f2df4accbaa..96f551ce51c 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -36,9 +36,9 @@ DEPEND="
X? ( x11-libs/libxkbcommon:=[X] )
x11-libs/pixman
gles? ( media-libs/libglvnd[X?] )
- system-wfconfig? ( >=gui-libs/wf-config-${PV} )
+ system-wfconfig? ( >=gui-libs/wf-config-${PV%.*} )
!system-wfconfig? ( !gui-libs/wf-config )
- system-wlroots? ( >=gui-libs/wlroots-0.11.0[elogind=,systemd=,X?] )
+ system-wlroots? ( >=gui-libs/wlroots-0.12.0[elogind=,systemd=,X?] )
!system-wlroots? ( !gui-libs/wlroots )
"
@@ -55,6 +55,10 @@ BDEPEND="
"
src_configure() {
+ sed -e "s:@EPREFIX@:${EPREFIX}:" \
+ "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
+ sed -e "s:@EPREFIX@:${EPREFIX}:" \
+ "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
local emesonargs=(
$(meson_feature system-wfconfig use_system_wfconfig)
$(meson_feature system-wlroots use_system_wlroots)
@@ -67,11 +71,13 @@ src_configure() {
src_install() {
default
meson_src_install
+ dobin "${T}"/wayfire-session
einstalldocs
insinto "/usr/share/wayland-sessions/"
insopts -m644
doins wayfire.desktop
+ doins "${T}"/wayfire-session.desktop
dodoc wayfire.ini
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/files/, gui-wm/wayfire/
@ 2023-04-18 7:48 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-04-18 7:48 UTC (permalink / raw
To: gentoo-commits
commit: bc5186b2759f5b09580ed33275b345d842ed0be3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 07:29:28 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 07:29:28 2023 +0000
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 <sam <AT> 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 000000000000..0ee666664c93
--- /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 <sam@gentoo.org>
+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 <cstddef>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <sstream>
+
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/files/, gui-wm/wayfire/
@ 2024-05-05 18:27 Viorel Munteanu
0 siblings, 0 replies; 5+ messages in thread
From: Viorel Munteanu @ 2024-05-05 18:27 UTC (permalink / raw
To: gentoo-commits
commit: 57236d595649afbb6777e95809156a31e45b084b
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sun May 5 18:03:55 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun May 5 18:27:29 2024 +0000
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 <ceamac <AT> 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 000000000000..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 000000000000..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 000000000000..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} == 9999 ]]; 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 "/usr/share/wayland-sessions/"
+ insopts -m644
+ doins wayfire.desktop
+ doins "${T}"/wayfire-session.desktop
+
+ insinto "/usr/share/wayfire/"
+ doins wayfire.ini
+
+ insinto "/etc"
+ doins "${FILESDIR}"/wayfire.env
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/files/, gui-wm/wayfire/
@ 2024-06-06 5:20 Viorel Munteanu
0 siblings, 0 replies; 5+ messages in thread
From: Viorel Munteanu @ 2024-06-06 5:20 UTC (permalink / raw
To: gentoo-commits
commit: b4fac4c4ef737c2dcdce7a043860835b64d126b9
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 6 05:19:30 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 05:20:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4fac4c4
gui-wm/wayfire: drop 0.8.1-r1
Signed-off-by: Viorel Munteanu <ceamac <AT> 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..000000000000
--- 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..000000000000
--- 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} == 9999 ]]; 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/files/, gui-wm/wayfire/
@ 2024-11-01 9:45 Viorel Munteanu
0 siblings, 0 replies; 5+ messages in thread
From: Viorel Munteanu @ 2024-11-01 9:45 UTC (permalink / raw
To: gentoo-commits
commit: 581c2068cb6194f5df19b2f4cb8718109c535b4f
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 1 09:42:28 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Nov 1 09:45:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=581c2068
gui-wm/wayfire: drop 0.8.1-r2
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
gui-wm/wayfire/Manifest | 1 -
...wayfire-0.8.0-dont-use-installed-config-h.patch | 65 -------------
.../wayfire/files/wayfire-0.8.1-fix-gcc-15.patch | 13 ---
gui-wm/wayfire/wayfire-0.8.1-r2.ebuild | 103 ---------------------
4 files changed, 182 deletions(-)
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 74a3981aec2f..677decdf3757 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,2 +1 @@
-DIST wayfire-0.8.1.tar.xz 856364 BLAKE2B 1b596b28878789ca26eeb57c6c24e0b69508731de2144e1477f8071b41f17757b2125f2f4f99670ca8b7f85172a9f641b9be1f9190eeff5b261bcc2df1bec4ab SHA512 7bce5656b6a7a7fe53b37492465dee3e591eb386666fdd3d6876f4a589f059510fb2d0c0a326df260ca6a293edf4ba43bb55f813e85d4d2d38d6ef1319280254
DIST wayfire-0.9.0.tar.xz 875584 BLAKE2B d7f07d7ff8a54437dc5b69e27dcfadecbd3426993e88f68f4af376bbbde08c8ea76646a361d4228ae8ee21e03c3ebe5562b80ec9d3aecde03fb653135fec8645 SHA512 572bfbe1821490842eae33285a0a5607f70b96b0d5b994246ffe6f0bd74ef03d8d699f3f429bff4d376a0a9390312aa67332e8f614fefa2400e0b844b2d74ab9
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
deleted file mode 100644
index 3938cd955ce2..000000000000
--- a/gui-wm/wayfire/files/wayfire-0.8.0-dont-use-installed-config-h.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://github.com/WayfireWM/wayfire/pull/2225
-
-From f7bcad19598cbff1324f7737022ffee8848b3555 Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-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 <parona@protonmail.com>
---- 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 <wayfire/config.h>
-+#ifdef WF_USE_CONFIG_H
-+ #include <config.h>
-+#else
-+ #include <wayfire/config.h>
- #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(<wayfire/config.h>)
-- #include <wayfire/config.h>
-+// WF_USE_CONFIG_H is set only when building Wayfire itself, external plugins
-+// need to use <wayfire/config.h>
-+#ifdef WF_USE_CONFIG_H
-+ #include <config.h>
- #else
-- #include "config.h"
-+ #include <wayfire/config.h>
- #endif
-
- #include <wayfire/nonstd/wlroots-full.hpp>
---- 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(<wayfire/config.h>)
-- #include <wayfire/config.h>
-+// WF_USE_CONFIG_H is set only when building Wayfire itself, external plugins
-+// need to use <wayfire/config.h>
-+#ifdef WF_USE_CONFIG_H
-+ #include <config.h>
- #else
-- #include "config.h"
-+ #include <wayfire/config.h>
- #endif
-
- #include <wayfire/nonstd/wlroots-full.hpp>
diff --git a/gui-wm/wayfire/files/wayfire-0.8.1-fix-gcc-15.patch b/gui-wm/wayfire/files/wayfire-0.8.1-fix-gcc-15.patch
deleted file mode 100644
index c769a4516c16..000000000000
--- a/gui-wm/wayfire/files/wayfire-0.8.1-fix-gcc-15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/938288
-https://github.com/WayfireWM/wayfire/pull/2441
-
---- a/src/api/wayfire/object.hpp
-+++ b/src/api/wayfire/object.hpp
-@@ -4,6 +4,7 @@
- #include <typeinfo>
- #include <memory>
- #include <string>
-+#include <cstdint>
-
- #include <wayfire/nonstd/observer_ptr.h>
-
diff --git a/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild b/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild
deleted file mode 100644
index 8f2348141cc5..000000000000
--- a/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,103 +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} == 9999 ]]; 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"
- "${FILESDIR}"/${P}-fix-gcc-15.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 "/usr/share/wayland-sessions/"
- insopts -m644
- doins wayfire.desktop
- doins "${T}"/wayfire-session.desktop
-
- insinto "/usr/share/wayfire/"
- doins wayfire.ini
-
- insinto "/etc"
- doins "${FILESDIR}"/wayfire.env
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-11-01 9:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-18 7:48 [gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/files/, gui-wm/wayfire/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-11-01 9:45 Viorel Munteanu
2024-06-06 5:20 Viorel Munteanu
2024-05-05 18:27 Viorel Munteanu
2020-11-13 21:04 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox