[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/, gui-wm/wayfire/files/
commit: 313a17318ddeb6039fd081da6793f64afad942d2
Author: Alfred Wingate protonmail com>
AuthorDate: Tue Mar 19 09:36:33 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 19 10:05:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=313a1731
gui-wm/wayfire: add patch to not use system installed configuration
* Otherwise you would get hard to parse errors when different parts of
build are built with different configurations.
Signed-off-by: Alfred Wingate protonmail.com>
Signed-off-by: Sam James gentoo.org>
...wayfire-0.8.0-dont-use-installed-config-h.patch | 65 ++
...ayfire-0.8.1.ebuild => wayfire-0.8.0-r2.ebuild} | 77 ++
...ayfire-0.8.1.ebuild => wayfire-0.8.1-r1.ebuild} | 4 ++
3 files changed, 134 insertions(+), 12 deletions(-)
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
new file mode 100644
index ..3938cd955ce2
--- /dev/null
+++ b/gui-wm/wayfire/files/wayfire-0.8.0-dont-use-installed-config-h.patch
@@ -0,0 +1,65 @@
+https://github.com/WayfireWM/wayfire/pull/2225
+
+From f7bcad19598cbff1324f7737022ffee8848b3555 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate
+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
+--- 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
++#ifdef WF_USE_CONFIG_H
++#include
++#else
++#include
+ #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()
+-#include
++// WF_USE_CONFIG_H is set only when building Wayfire itself, external plugins
++// need to use
++#ifdef WF_USE_CONFIG_H
++#include
+ #else
+-#include "config.h"
++#include
+ #endif
+
+ #include
+--- 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()
+-#include
++// WF_USE_CONFIG_H is set only when building Wayfire itself, external plugins
++// need to use
++#ifdef WF_USE_CONFIG_H
++#include
+ #else
+-#include "config.h"
++#include
+ #endif
+
+ #include
diff --git a/gui-wm/wayfire/wayfire-0.8.1.ebuild
b/gui-wm/wayfire/wayfire-0.8.0-r2.ebuild
similarity index 55%
copy from gui-wm/wayfire/wayfire-0.8.1.ebuild
copy to gui-wm/wayfire/wayfire-0.8.0-r2.ebuild
index a5e655f6d398..c6ed5fedef88 100644
--- a/gui-wm/wayfire/wayfire-0.8.1.ebuild
+++ b/gui-wm/wayfire/wayfire-0.8.0-r2.ebuild
@@ -11,55 +11,99 @@ 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"
+ SLOT="0/"
else
SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz;
- KEYWORDS="~amd64 ~arm64 ~riscv"
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
SLOT="0/$(ver_cut 1-2)"
fi
LICENSE="MIT"
-IUSE="+gles test X"
+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/glib:2
dev-libs/libevdev
- >=dev-libs/libinput-1.7.0:=
+ >=dev-libs/libinput-1.7.0
dev-libs/wayland
>=dev-libs/wayland-protocols-1.12
- gui-libs/wf-config:${SLOT}
-
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/, gui-wm/wayfire/files/
commit: 25e6c5f39257e9bbfb166f763a2c18000c0fc1b6
Author: Alfred Wingate protonmail com>
AuthorDate: Thu Mar 14 11:47:56 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Mar 16 19:18:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e6c5f3
gui-wm/wayfire: drop 0.7.5-r1, 0.8.0
Signed-off-by: Alfred Wingate protonmail.com>
Signed-off-by: Arthur Zamarin gentoo.org>
gui-wm/wayfire/Manifest| 1 -
gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch | 25
gui-wm/wayfire/wayfire-0.7.5-r1.ebuild | 116 ---
gui-wm/wayfire/wayfire-0.8.0.ebuild| 153 -
4 files changed, 295 deletions(-)
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 60931f638e27..45e2431c82bb 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,3 +1,2 @@
-DIST wayfire-0.7.5.tar.xz 781952 BLAKE2B
10f4927d793ad2f8047ab5608db72bb5988fbb4df805dc65a87b011453729109ca0b3a92cf89e867266fae52268e1e2ac452bbd6efcc81e8f1a0c0640008adc1
SHA512
fce6d4c81fa3675df1e656f8bf504f7fc9d1b7104687bcc6d669950582f46bd0ad084c6a487434077df029438243cd91cf6ec60dc7d584b40bfd7a4c8d069f53
DIST wayfire-0.8.0.tar.xz 828576 BLAKE2B
4d80a0d43061a4564d45f7c077fd97737b426c4036c12f004815dbad120f51b38b2fac9a010e2df27a6a96205cd0dcceb81864bdccbd6e337d81f6c37926e019
SHA512
fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1dfdc8b1b898d998a9
DIST wayfire-0.8.1.tar.xz 856364 BLAKE2B
1b596b28878789ca26eeb57c6c24e0b69508731de2144e1477f8071b41f17757b2125f2f4f99670ca8b7f85172a9f641b9be1f9190eeff5b261bcc2df1bec4ab
SHA512
7bce5656b6a7a7fe53b37492465dee3e591eb38fdd3d6876f4a589f059510fb2d0c0a326df260ca6a293edf4ba43bb55f813e85d4d2d38d6ef1319280254
diff --git a/gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch
b/gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch
deleted file mode 100644
index 0ee64c93..
--- a/gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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-r1.ebuild
b/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild
deleted file mode 100644
index eed7d341eeca..
--- a/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild
+++ /dev/null
@@ -1,116 +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;
-else
-
SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz;
- KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+gles +system-wfconfig +system-wlroots X"
-
-DEPEND="
- dev-libs/libinput:=
- dev-libs/wayland
- gui-libs/gtk-layer-shell
- media-libs/glm
- media-libs/mesa:=[gles2,wayland,X?]
- media-libs/libglvnd[X?]
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- media-libs/freetype:=[X?]
- x11-libs/libdrm
- x11-libs/gtk+:3=[wayland,X?]
- x11-libs/cairo[X?,svg(+)]
- x11-libs/libxkbcommon[X?]
- x11-libs/pango
- x11-libs/pixman
- X? (
- x11-base/xwayland
- x11-libs/libxcb
- )
-"
-
-if [[ ${PV} == ]] ; then
- DEPEND+="
- system-wfconfig? ( ~gui-libs/wf-config-:= )
- !system-wfconfig? ( !gui-libs/wf-config )
- system-wlroots? (
~gui-libs/wlroots-:=[drm(+),libinput(+),x11-backend,X?] )
- !system-wlroots? ( !gui-libs/wlroots )
- "
-else
- DEPEND+="
- system-wfconfig? (
- >=gui-libs/wf-config-0.7.1
- =gui-libs/wlroots-0.16.0:0/16[drm(+),libinput(+),x11-backend,X?]
- )
- !system-wlroots? ( !gui-libs/wlroots )
- "
-fi
-
-RDEPEND="
- ${DEPEND}
- x11-misc/xkeyboard-config
-"
-
-BDEPEND="
- dev-libs/wayland-protocols
-
[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/, gui-wm/wayfire/files/
commit: b80e6a855ec9c0d2b96782ad8b72555295f85340
Author: Alfred Wingate protonmail com>
AuthorDate: Thu Jan 25 16:06:09 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Jan 30 11:32:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b80e6a85
gui-wm/wayfire: fix duplicate manpage
Closes: https://bugs.gentoo.org/922898
Signed-off-by: Alfred Wingate protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35009
Signed-off-by: Sam James gentoo.org>
.../wayfire-0.8.0-fix-duplicate-manpage.patch | 21 +++
gui-wm/wayfire/wayfire-0.8.0-r1.ebuild | 162 +
2 files changed, 183 insertions(+)
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
new file mode 100644
index ..393de41d0ccb
--- /dev/null
+++ b/gui-wm/wayfire/files/wayfire-0.8.0-fix-duplicate-manpage.patch
@@ -0,0 +1,21 @@
+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'))
diff --git a/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild
b/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild
new file mode 100644
index ..1fb2416c2bd8
--- /dev/null
+++ b/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson toolchain-funcs
+
+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/"
+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="debug +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} == ]] ; then
+ CDEPEND+="
+ system-wlroots? (
gui-libs/wlroots:0/[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 >
