summaryrefslogtreecommitdiff
path: root/gui-wm/wayfire
diff options
context:
space:
mode:
Diffstat (limited to 'gui-wm/wayfire')
-rw-r--r--gui-wm/wayfire/Manifest15
-rw-r--r--gui-wm/wayfire/files/wayfire-0.8.0-fix-duplicate-manpage.patch21
-rw-r--r--gui-wm/wayfire/files/wayfire-0.8.1-fix-gcc-15.patch13
-rw-r--r--gui-wm/wayfire/files/wayfire-session17
-rw-r--r--gui-wm/wayfire/metadata.xml3
-rw-r--r--gui-wm/wayfire/wayfire-0.8.0-r1.ebuild157
-rw-r--r--gui-wm/wayfire/wayfire-0.8.0-r2.ebuild158
-rw-r--r--gui-wm/wayfire/wayfire-0.8.1-r2.ebuild3
-rw-r--r--gui-wm/wayfire/wayfire-0.9.0.ebuild (renamed from gui-wm/wayfire/wayfire-0.8.1-r1.ebuild)48
-rw-r--r--gui-wm/wayfire/wayfire-9999.ebuild4
10 files changed, 49 insertions, 390 deletions
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 403e745e54d8..7b228bf11814 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,14 +1,11 @@
AUX wayfire-0.8.0-dont-use-installed-config-h.patch 1999 BLAKE2B 6f87e25841dfcd266a7507d72d5c6602fd11a24b8a5e7f90c51e8b93592355f2971ee2eb0c9088a17921f5cf6dd690ebd0d54ea03f6fe026794d5d7c2eafaeb0 SHA512 0cbdf8bcf54491969ad5d0da9d2736775112ea168bbeb03bc252961cbe011b16bcf193ed3bef9effeeaac870405141819d1cb2dc2cb3cab20fc97dcb33639fdd
-AUX wayfire-0.8.0-fix-duplicate-manpage.patch 755 BLAKE2B c4e3fec4c5861eadd58480d098f92ae5d24b798d29e2e5898eda80132df53705e440516b6af67de4eadd7d788c106b72693e315467f3397be12ab6d03da5082c SHA512 77930c892938d3f27e12e9a2f1ac31f9552c91869e011b933d2bb1f6b986abda75f71d1bb008f71665d3edf9a2fb0e650ad1fc397f4dc0c9bcb77f94d7f8ea24
-AUX wayfire-session 540 BLAKE2B 02970ebece43c8643ab68f0108d2166f7946d54cea7c6143c9badf0e9852bed4af14bb0c4dd3101a179958b06904889204915e965c46f64073fb8f05800553e3 SHA512 616bbf244a358fb7fbeb1230a3ba862a7ca373fdf3b181819a05ca63da82c78fcd80d0f7167d50488c38820559f007702d2c86ac861f214775c3a6271351bb1d
+AUX wayfire-0.8.1-fix-gcc-15.patch 286 BLAKE2B 43dc74d3cdec6102d6c89f70736066c4db122a900c7211496639b1612d8dbe6380fda30d373fe4d6b0a3e49c19695538e5607eb68683278f1094eaa7732c17e6 SHA512 a8d1d2775e0a1b664551f3bf861f360e079ccbc49fe1a4cd453c8a200d68f719bd6a5bf8df9e64b3612b537545d181f9deac9d0ad93b601937d116e87823609c
AUX wayfire-session-2 871 BLAKE2B cb2db6d1a2944d0ce60e67328e9353d3e4c69b5d5f9e4fee4351e51d78dc9deb3f8ddd338bbbd7b047cd029360b66d02ec9791f049f59eed8155992c89062e11 SHA512 380708daacc92cf8c94c9fee9c1e374dddb90f83438277c360d904dd34cf30634f90caf9e53ca3511b679f499f0044e35f80516bea1f1bbe8057fae85cad9963
AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca6151866599c0a7d0ef5b17c2b88ff6178c6f6d42506f1d6f6cbce8f9231388fa63e2a870116a45c677bd9faee94eabfac SHA512 0c7fd2f04c5b2c413bda02f2c43090dc8c64503d372e8eb19df8a4d7190f6ba703db672753bfa0629a2f627b505886c33f874a933cc6cf7f876caf60a4e70039
AUX wayfire.env 80 BLAKE2B ff44da0d760ab3ba5e68009e4eea3112d4882331fd678b286f741bb87e2319c87e48d689318fe99a79bb6af3127ec97a99de8994f5c18d96086cc7f3d1e68160 SHA512 2118195fb4ceb6a994043a4bd5608ee9bb104dd769cf3ffba449b053fa05a6e7464ab9c3f812bd0f9bf4ed73eb7f5e2afa1ee48373765b8429317efa11089cd6
-DIST wayfire-0.8.0.tar.xz 828576 BLAKE2B 4d80a0d43061a4564d45f7c077fd97737b426c4036c12f004815dbad120f51b38b2fac9a010e2df27a6a96205cd0dcceb81864bdccbd6e337d81f6c37926e019 SHA512 fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1d4444fdc8b1b898d998a9
DIST wayfire-0.8.1.tar.xz 856364 BLAKE2B 1b596b28878789ca26eeb57c6c24e0b69508731de2144e1477f8071b41f17757b2125f2f4f99670ca8b7f85172a9f641b9be1f9190eeff5b261bcc2df1bec4ab SHA512 7bce5656b6a7a7fe53b37492465dee3e591eb386666fdd3d6876f4a589f059510fb2d0c0a326df260ca6a293edf4ba43bb55f813e85d4d2d38d6ef1319280254
-EBUILD wayfire-0.8.0-r1.ebuild 3710 BLAKE2B 5f64dbdb42209d9b05a0eaa30f47fdbf0d3622e242cf5eb31598efdc615201a53c733d4ba0a4d5710d0131e91bcc3bd242e524493d37652e0a8110ba3c8bc1d7 SHA512 968704fbb1d2145064e98da1f0aad422eac38ecd2aac4009663a97efe5f11f9d1420e2a251815255b47afcd326646119a94769e0f4b569fb4c83326e08f1e56c
-EBUILD wayfire-0.8.0-r2.ebuild 3776 BLAKE2B b848744075d055977581665f1b4cccaf5608e0ad0516730c11970a56bde7394b28201f43850a154ea3094e7333e8903576bbb3d32f9415835232aa9617f3b970 SHA512 2ece76e1779c0259a14be3599961cbd7ddd2cb7c2481a1e60009074669b4f1e265a93886999223d8894c96f115ee0b6fe642204323babb53bf2b534bfc5aea27
-EBUILD wayfire-0.8.1-r1.ebuild 2471 BLAKE2B 49d1238ea8136959b2acd3504a2a72a81b340660de7ba28c8935833e984a1b95272db93793bdc685aa9f9de7ef2c8500b3eccae143199f94a5f5dfa5a6dd3c19 SHA512 a8ac07b6ea9c6397345b5913dda1910a89976d36d37414f8debaca2c225c7ce545dc472b92aafec66f611fd91097dfbfdc7706d33e4abfb98aa14c70e164a947
-EBUILD wayfire-0.8.1-r2.ebuild 2280 BLAKE2B 147c76241aa0465a6e48a423fb33f63358d5b64f187b180c5f5baec38b9b361da191e87d16215699b9bdb36cdedf48eec483de13130e6a0dd415c7db50ae4619 SHA512 96e0ef86dd0b8b298c11389a6929b07e1182eccd8375b156838e7b03377411171967787af61a5e6daea232f9ce3b00f485f08ee370bf4ecadbba87222021d7a0
-EBUILD wayfire-9999.ebuild 2204 BLAKE2B f99a53028c1b2cac6922f71a9e250857767c45692bc2d252fc58c9a6c855a2966ccbf78c364d9c9bcdf5e9c21c4048307e6a2ccb15bb44c9e4b575615acea2d3 SHA512 65f8095127deaa1433c0625e059322bb0ce73ef485677c5e848191330eee0df0682cbed29610b177b2257a5b6e204d9bf7cba689cc8fe5852a109966487dacc0
-MISC metadata.xml 1171 BLAKE2B 9517f1c85eb2f85a578d512d163a3f104ed8d621ce19ac42450897b499c033eff8bd121dd472946154c49b75151a01f282f39af5c3967e3192ec029db38b2d0a SHA512 9481f8f77574f9224b6e5ee3f4feabf2960b21b8331e16c4031b7d1f0068564a1567319d0e4246c5c918d4294d5dd7cca94fe015ca0327944c6047aa2c1b5f12
+DIST wayfire-0.9.0.tar.xz 875584 BLAKE2B d7f07d7ff8a54437dc5b69e27dcfadecbd3426993e88f68f4af376bbbde08c8ea76646a361d4228ae8ee21e03c3ebe5562b80ec9d3aecde03fb653135fec8645 SHA512 572bfbe1821490842eae33285a0a5607f70b96b0d5b994246ffe6f0bd74ef03d8d699f3f429bff4d376a0a9390312aa67332e8f614fefa2400e0b844b2d74ab9
+EBUILD wayfire-0.8.1-r2.ebuild 2316 BLAKE2B ec956dc6cf1cf0b6cfb9e52d66c339e3610573162b69fd430d99b22f5eba9e95693ee4ca78756e8912b4a2430ac07ae5f11bd906ad2a7862e3b894f769cd8e08 SHA512 e8d4de79a788acfa27939dba6be9310385c6e3176fe07ba870e83a12a97e5c8e3040f49b0468cb06ef010211e4d549ee2938a17203f438e06a27143e3f82fd8f
+EBUILD wayfire-0.9.0.ebuild 2505 BLAKE2B 7be15ff9d2ad916955594d69b8c4fbb0b525de174aa82f10285247fdf3c0b578197c24e7257d4a52654a08855034143b9ba27f170e6be0dd7ccd416b2153d1b3 SHA512 164a413a71ab5ef86017113554f37d6ef71bf09166e058c190b62cd2baf6cecd4306dca683c60dcc674cedc31a119b693faef9343000d91457ea3c8d4d6027d4
+EBUILD wayfire-9999.ebuild 2197 BLAKE2B 2e95c2e8d743709c9cadf7c9ad3eed3e563f49a95b24daac0348a84b2a7a3937d7dcbca62a3ca384b95492ba2c296963a719b490dda914d6c1b8d44e80b06d78 SHA512 4d57a79f859e45cc56635e7458e09527900b4f9f1b0f2552112d3f8b73e19024e6a0a2b878e67de48d68614f0240b229e35fb9ddc1e898809f5e6b146966d4d2
+MISC metadata.xml 698 BLAKE2B 9d37ee94b17887e40ddb08276d35380699c763326bdfeb307aaca933131f0bbdb0e7bbc2b0e6e06324127c6d85dd926abaf7d266f07cd215946fcfade114a78c SHA512 03b6a16d957b86c822e042c599b310bd3ae1f0d1fe6e97afcec27d0d948e742e1545f605eb3905c4d443f5bdf7174ed838573e7bf50344cab2302e6c4618a7ed
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..000000000000
--- 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 <alice@ayaya.dev>
-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/files/wayfire-0.8.1-fix-gcc-15.patch b/gui-wm/wayfire/files/wayfire-0.8.1-fix-gcc-15.patch
new file mode 100644
index 000000000000..c769a4516c16
--- /dev/null
+++ b/gui-wm/wayfire/files/wayfire-0.8.1-fix-gcc-15.patch
@@ -0,0 +1,13 @@
+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/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/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.
</longdescription>
<use>
- <flag name="gles">use libglvnd to do animations more efficiently</flag>
<flag name="gles3">Enable OpenGL ES 3.x Features.</flag>
- <flag name="system-wfconfig">Use the system-wide <pkg>gui-libs/wf-config</pkg> instead of building as a submodule. It will block system-wide <pkg>gui-libs/wf-config</pkg> from being installed.</flag>
- <flag name="system-wlroots">Use the system-wide <pkg>gui-libs/wlroots</pkg> instead of building as a submodule. It will block system-wide <pkg>gui-libs/wlroots</pkg> from being installed.</flag>
<flag name="X">Enable support for X11 applications (XWayland).</flag>
</use>
<upstream>
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..000000000000
--- 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} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
- SLOT="0/9999"
-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} == 9999 ]] ; then
- CDEPEND+="
- system-wlroots? ( gui-libs/wlroots:0/9999[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}" != 9999 ]]; 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=(
- $(meson_feature system-wfconfig use_system_wfconfig)
- $(meson_feature system-wlroots use_system_wlroots)
- $(meson_feature test tests)
- $(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/wayfire.ini ~/.config/wayfire.ini"
- fi
-}
diff --git a/gui-wm/wayfire/wayfire-0.8.0-r2.ebuild b/gui-wm/wayfire/wayfire-0.8.0-r2.ebuild
deleted file mode 100644
index d2c8b090436a..000000000000
--- a/gui-wm/wayfire/wayfire-0.8.0-r2.ebuild
+++ /dev/null
@@ -1,158 +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/9999"
-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="+gles3 +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} == 9999 ]] ; then
- CDEPEND+="
- system-wlroots? ( gui-libs/wlroots:0/9999[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"
- "${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
-
- if [[ "${PV}" != 9999 ]]; 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=(
- $(meson_feature system-wfconfig use_system_wfconfig)
- $(meson_feature system-wlroots use_system_wlroots)
- $(meson_feature test tests)
- $(meson_feature X xwayland)
- $(meson_use gles3 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/wayfire.ini ~/.config/wayfire.ini"
- fi
-}
diff --git a/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild b/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild
index ff1a84e65576..8f2348141cc5 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} == 9999 ]]; 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
@@ -61,6 +61,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/wayfire-0.8.0-dont-use-installed-config-h.patch"
+ "${FILESDIR}"/${P}-fix-gcc-15.patch
)
src_prepare() {
diff --git a/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild b/gui-wm/wayfire/wayfire-0.9.0.ebuild
index f3277a9f1614..cc5975a96622 100644
--- a/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild
+++ b/gui-wm/wayfire/wayfire-0.9.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit meson
+inherit meson toolchain-funcs
DESCRIPTION="compiz like 3D wayland compositor"
HOMEPAGE="https://github.com/WayfireWM/wayfire"
@@ -11,15 +11,15 @@ 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"
+ SLOT="0/0.10"
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
LICENSE="MIT"
-IUSE="+gles3 test X"
+IUSE="X +dbus +gles3 openmp test"
RESTRICT="!test? ( test )"
# bundled wlroots has the following dependency string according to included headers.
@@ -29,7 +29,7 @@ CDEPEND="
dev-cpp/nlohmann_json
dev-libs/glib:2
dev-libs/libevdev
- >=dev-libs/libinput-1.7.0:=
+ dev-libs/libinput:=
dev-libs/wayland
>=dev-libs/wayland-protocols-1.12
gui-libs/wf-config:${SLOT}
@@ -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="
@@ -58,17 +57,28 @@ DEPEND="
BDEPEND="
dev-util/wayland-scanner
virtual/pkgconfig
+ openmp? (
+ || (
+ sys-devel/gcc[openmp]
+ sys-devel/clang-runtime[openmp]
+ )
+ )
"
-PATCHES=(
- "${FILESDIR}/wayfire-0.8.0-dont-use-installed-config-h.patch"
-)
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
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
}
@@ -78,6 +88,7 @@ src_configure() {
$(meson_feature test tests)
$(meson_feature X xwayland)
$(meson_use gles3 enable_gles32)
+ $(meson_use openmp enable_openmp)
-Duse_system_wfconfig=enabled
-Duse_system_wlroots=enabled
)
@@ -96,14 +107,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
}
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index bce466406ffd..4d9595e505b1 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -11,7 +11,7 @@ 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.9"
+ SLOT="0/0.10"
else
SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
KEYWORDS="~amd64 ~arm64 ~riscv"
@@ -29,7 +29,7 @@ CDEPEND="
dev-cpp/nlohmann_json
dev-libs/glib:2
dev-libs/libevdev
- >=dev-libs/libinput-1.7.0:=
+ dev-libs/libinput:=
dev-libs/wayland
>=dev-libs/wayland-protocols-1.12
gui-libs/wf-config:${SLOT}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-07 17:51:18 +0000