[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/files/, gui-wm/wayfire/

["Viorel Munteanu" <ceamac@gentoo.org>]

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
-}