diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-11-02 03:04:24 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-11-02 03:04:24 +0000 |
commit | 37a097af13d675b83911ac006ee9ee22d2163f9a (patch) | |
tree | 75294129093c3332ea0ba918643a3485b19550f6 /gui-wm/wayfire | |
parent | aac5e1b02ac846f5e1ce85f4f66fdec46aa9b0d1 (diff) |
gentoo auto-resync : 02:11:2024 - 03:04:23
Diffstat (limited to 'gui-wm/wayfire')
-rw-r--r-- | gui-wm/wayfire/Manifest | 4 | ||||
-rw-r--r-- | gui-wm/wayfire/files/wayfire-0.8.0-dont-use-installed-config-h.patch | 65 | ||||
-rw-r--r-- | gui-wm/wayfire/files/wayfire-0.8.1-fix-gcc-15.patch | 13 | ||||
-rw-r--r-- | gui-wm/wayfire/wayfire-0.8.1-r2.ebuild | 103 |
4 files changed, 0 insertions, 185 deletions
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index e653d299bdbd..a5180cf99546 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1,11 +1,7 @@ -AUX wayfire-0.8.0-dont-use-installed-config-h.patch 1999 BLAKE2B 6f87e25841dfcd266a7507d72d5c6602fd11a24b8a5e7f90c51e8b93592355f2971ee2eb0c9088a17921f5cf6dd690ebd0d54ea03f6fe026794d5d7c2eafaeb0 SHA512 0cbdf8bcf54491969ad5d0da9d2736775112ea168bbeb03bc252961cbe011b16bcf193ed3bef9effeeaac870405141819d1cb2dc2cb3cab20fc97dcb33639fdd -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.1.tar.xz 856364 BLAKE2B 1b596b28878789ca26eeb57c6c24e0b69508731de2144e1477f8071b41f17757b2125f2f4f99670ca8b7f85172a9f641b9be1f9190eeff5b261bcc2df1bec4ab SHA512 7bce5656b6a7a7fe53b37492465dee3e591eb386666fdd3d6876f4a589f059510fb2d0c0a326df260ca6a293edf4ba43bb55f813e85d4d2d38d6ef1319280254 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 2503 BLAKE2B d7e47565d88bed8fbcd857541349088c31a9d885358c5f20c1e5e14ab390ad07c4ced1050849e2665f8ac26ce2174951fdb2d25ec4565e8ab13cef9f2c897346 SHA512 058ae5580ae2c29546b095a47a1641f99a1e749b94d2f47bf46c26d7e1e85bb17172020197537d1eea3d1985769d1baf5e041a0870e6ada4a5efaadf65ae1796 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-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 -} |