Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 915795 | Differences between
and this patch

Collapse All | Expand All

(-)a/0001-Update-to-wf-config-wayfire-wayfire-plugins-extra-0..patch (+38 lines)
Line 0 Link Here
1
From 4387dd476193f936661a611bfaf73281c4d67c1c Mon Sep 17 00:00:00 2001
2
From: Alexis <flexibeast@gmail.com>
3
Date: Sun, 15 Oct 2023 15:05:12 +1100
4
Subject: [PATCH] Update to {wf-config,wayfire,wayfire-plugins-extra}-0.8.0.
5
6
Signed-off-by: Alexis <flexibeast@gmail.com>
7
---
8
 gui-libs/wayfire-plugins-extra/Manifest | 1 +
9
 gui-libs/wf-config/Manifest             | 1 +
10
 gui-wm/wayfire/Manifest                 | 1 +
11
 3 files changed, 3 insertions(+)
12
13
diff --git a/gui-libs/wayfire-plugins-extra/Manifest b/gui-libs/wayfire-plugins-extra/Manifest
14
index 7331f5a979..978b46064a 100644
15
--- a/gui-libs/wayfire-plugins-extra/Manifest
16
+++ b/gui-libs/wayfire-plugins-extra/Manifest
17
@@ -1,2 +1,3 @@
18
 DIST wayfire-plugins-extra-0.7.0.tar.xz 74312 BLAKE2B f72d706502499e4d467a4b59e10f66628024be1bab1c5e10c807758869c9b9e4aacbe426c2db0e3faa5ab166f7e4f4d0f1c345e205c6747a16a164745c6f0d74 SHA512 ff25a4685c88ca0129a2372b216166246cab072c2cb4f84eb7bd500db525bf5881bd7e54d0d888473d4aab0e5b33d2ee13eb7f788bb2a524e1e8e0c5efc1a6bd
19
 DIST wayfire-plugins-extra-0.7.5.tar.xz 75136 BLAKE2B 7ffbb73f09175cc92f09b8a3f0493942741564278f95ff1d80066044b02ce4ceb925919ddb54fc6a37676b925d95ea7f93d09c6b0ccd448c6e9b821106d6e3ea SHA512 9cc816c3c727b0093fd15ef52dea215598b4c49ef96c098f53938c041b3908b30f4dd616be4b459b7382d630a47b36baf845c24de84f35670ba2912711205911
20
+DIST wayfire-plugins-extra-0.8.0.tar.xz 70324 BLAKE2B f8f46782e31f170eb566567f50d302df4db23fbeb29c71569624a7f79c2bbcfcf48b070e7b55bf1880a9cd02afe78783d6680c457e466d765eb0db72f4b1f61b SHA512 8105fea3d8405a88d8c872c1012dadfab55f987a8ff8401f5caeec155214727021cbc7cfaba71c5ee3bc869caf136dcd78c189921c2f41a938b8552962f1597c
21
diff --git a/gui-libs/wf-config/Manifest b/gui-libs/wf-config/Manifest
22
index 15f9e410c0..1959ca230d 100644
23
--- a/gui-libs/wf-config/Manifest
24
+++ b/gui-libs/wf-config/Manifest
25
@@ -1 +1,2 @@
26
 DIST wf-config-0.7.1.tar.xz 39120 BLAKE2B b18048334df12b002391fe4a74529cb61df76a0678c9052f8ac91d777e8a48dae46b87680fb44630ebfb9a350dbac36b15bc81850341fa4cd6299c12f6fa057d SHA512 d535a09a3465a54a607df7b8764ee6818ab8b83536d68c85167b282b95a176636e4bf5cda6c0d1638c07721a1f4208203e9d41b83675038fb590a535314df719
27
+DIST wf-config-0.8.0.tar.xz 41200 BLAKE2B d56cd04c18c2cd8c0bac86493ad662244bde0e9cce1caf81d0fff34d9f2df2470c1aa8c95fead9e91dd5793d570b01dc6ef99b1986b8658b06ef93156a1526f8 SHA512 79cca2429a39ee81f853043698c57fc08025634926773253cff73fc564dcf203335b4b861d82b60a769bbab7b07be6a7e181c9ea29ad98ce930de20f9723893f
28
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
29
index b0f036b8be..1d54c8fd01 100644
30
--- a/gui-wm/wayfire/Manifest
31
+++ b/gui-wm/wayfire/Manifest
32
@@ -1,2 +1,3 @@
33
 DIST wayfire-0.7.3.tar.xz 765524 BLAKE2B b82c66796d7fb3d07c7bd9078755b7c38df1bd5c93daa659fc98b1182679bc0a06a24b322c6ab492d06d30c898659e2ba849c1d5944260e8775a04fd8a5bd078 SHA512 7bb5b8492a632a9816e847ec72def74dc234bcc30da7c320a0cd3b1d60492f5521ad8ac76a12ef967d1b114bcde9be72eb8ffc618977aed8e198d4ace1e7056e
34
 DIST wayfire-0.7.5.tar.xz 781952 BLAKE2B 10f4927d793ad2f8047ab5608db72bb5988fbb4df805dc65a87b011453729109ca0b3a92cf89e867266fae52268e1e2ac452bbd6efcc81e8f1a0c0640008adc1 SHA512 fce6d4c81fa3675df1e656f8bf504f7fc9d1b7104687bcc6d669950582f46bd0ad084c6a487434077df029438243cd91cf6ec60dc7d584b40bfd7a4c8d069f53
35
+DIST wayfire-0.8.0.tar.xz 828576 BLAKE2B 4d80a0d43061a4564d45f7c077fd97737b426c4036c12f004815dbad120f51b38b2fac9a010e2df27a6a96205cd0dcceb81864bdccbd6e337d81f6c37926e019 SHA512 fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1d4444fdc8b1b898d998a9
36
-- 
37
2.41.0
38
(-)a/gui-libs/wayfire-plugins-extra/Manifest (+1 lines)
Lines 1-2 Link Here
1
DIST wayfire-plugins-extra-0.7.0.tar.xz 74312 BLAKE2B f72d706502499e4d467a4b59e10f66628024be1bab1c5e10c807758869c9b9e4aacbe426c2db0e3faa5ab166f7e4f4d0f1c345e205c6747a16a164745c6f0d74 SHA512 ff25a4685c88ca0129a2372b216166246cab072c2cb4f84eb7bd500db525bf5881bd7e54d0d888473d4aab0e5b33d2ee13eb7f788bb2a524e1e8e0c5efc1a6bd
1
DIST wayfire-plugins-extra-0.7.0.tar.xz 74312 BLAKE2B f72d706502499e4d467a4b59e10f66628024be1bab1c5e10c807758869c9b9e4aacbe426c2db0e3faa5ab166f7e4f4d0f1c345e205c6747a16a164745c6f0d74 SHA512 ff25a4685c88ca0129a2372b216166246cab072c2cb4f84eb7bd500db525bf5881bd7e54d0d888473d4aab0e5b33d2ee13eb7f788bb2a524e1e8e0c5efc1a6bd
2
DIST wayfire-plugins-extra-0.7.5.tar.xz 75136 BLAKE2B 7ffbb73f09175cc92f09b8a3f0493942741564278f95ff1d80066044b02ce4ceb925919ddb54fc6a37676b925d95ea7f93d09c6b0ccd448c6e9b821106d6e3ea SHA512 9cc816c3c727b0093fd15ef52dea215598b4c49ef96c098f53938c041b3908b30f4dd616be4b459b7382d630a47b36baf845c24de84f35670ba2912711205911
2
DIST wayfire-plugins-extra-0.7.5.tar.xz 75136 BLAKE2B 7ffbb73f09175cc92f09b8a3f0493942741564278f95ff1d80066044b02ce4ceb925919ddb54fc6a37676b925d95ea7f93d09c6b0ccd448c6e9b821106d6e3ea SHA512 9cc816c3c727b0093fd15ef52dea215598b4c49ef96c098f53938c041b3908b30f4dd616be4b459b7382d630a47b36baf845c24de84f35670ba2912711205911
3
DIST wayfire-plugins-extra-0.8.0.tar.xz 70324 BLAKE2B f8f46782e31f170eb566567f50d302df4db23fbeb29c71569624a7f79c2bbcfcf48b070e7b55bf1880a9cd02afe78783d6680c457e466d765eb0db72f4b1f61b SHA512 8105fea3d8405a88d8c872c1012dadfab55f987a8ff8401f5caeec155214727021cbc7cfaba71c5ee3bc869caf136dcd78c189921c2f41a938b8552962f1597c
(-)a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.8.0.ebuild (+36 lines)
Line 0 Link Here
1
# Copyright 2019-2023 Gentoo Authors
2
# Distributed under the terms of the GNU General Public License v2
3
4
EAPI=8
5
6
inherit meson
7
8
DESCRIPTION="extra plugins for wayfire"
9
HOMEPAGE="https://github.com/WayfireWM/wayfire-plugins-extra"
10
11
if [[ ${PV} == 9999 ]]; then
12
	inherit git-r3
13
	EGIT_REPO_URI="https://github.com/WayfireWM/wayfire-plugins-extra.git"
14
else
15
	SRC_URI="https://github.com/WayfireWM/wayfire-plugins-extra/releases/download/v${PV}/${P}.tar.xz"
16
	KEYWORDS="amd64 ~arm64 ~x86"
17
fi
18
19
LICENSE="MIT"
20
SLOT="0"
21
22
DEPEND="
23
	dev-cpp/glibmm:2
24
	x11-libs/pixman
25
	gnome-base/librsvg
26
	>=gui-libs/wlroots-0.16.0:0/16
27
	<gui-libs/wlroots-0.17.0:=
28
	>=gui-wm/wayfire-0.7.5
29
	x11-libs/cairo
30
	x11-libs/pixman
31
"
32
RDEPEND="${DEPEND}"
33
BDEPEND="
34
	dev-libs/wayland-protocols
35
	virtual/pkgconfig
36
"
(-)a/gui-libs/wf-config/Manifest (+1 lines)
Line 1 Link Here
1
DIST wf-config-0.7.1.tar.xz 39120 BLAKE2B b18048334df12b002391fe4a74529cb61df76a0678c9052f8ac91d777e8a48dae46b87680fb44630ebfb9a350dbac36b15bc81850341fa4cd6299c12f6fa057d SHA512 d535a09a3465a54a607df7b8764ee6818ab8b83536d68c85167b282b95a176636e4bf5cda6c0d1638c07721a1f4208203e9d41b83675038fb590a535314df719
1
DIST wf-config-0.7.1.tar.xz 39120 BLAKE2B b18048334df12b002391fe4a74529cb61df76a0678c9052f8ac91d777e8a48dae46b87680fb44630ebfb9a350dbac36b15bc81850341fa4cd6299c12f6fa057d SHA512 d535a09a3465a54a607df7b8764ee6818ab8b83536d68c85167b282b95a176636e4bf5cda6c0d1638c07721a1f4208203e9d41b83675038fb590a535314df719
2
DIST wf-config-0.8.0.tar.xz 41200 BLAKE2B d56cd04c18c2cd8c0bac86493ad662244bde0e9cce1caf81d0fff34d9f2df2470c1aa8c95fead9e91dd5793d570b01dc6ef99b1986b8658b06ef93156a1526f8 SHA512 79cca2429a39ee81f853043698c57fc08025634926773253cff73fc564dcf203335b4b861d82b60a769bbab7b07be6a7e181c9ea29ad98ce930de20f9723893f
(-)a/gui-libs/wf-config/wf-config-0.8.0.ebuild (+42 lines)
Line 0 Link Here
1
# Copyright 2019-2023 Gentoo Authors
2
# Distributed under the terms of the GNU General Public License v2
3
4
EAPI=7
5
6
inherit meson
7
8
DESCRIPTION="library for managing wayfire configuration files"
9
HOMEPAGE="https://github.com/WayfireWM/wf-config"
10
11
if [[ ${PV} == 9999 ]]; then
12
	inherit git-r3
13
	EGIT_REPO_URI="https://github.com/WayfireWM/wf-config.git"
14
else
15
	SRC_URI="https://github.com/WayfireWM/wf-config/releases/download/v${PV}/${P}.tar.xz"
16
	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
17
fi
18
19
LICENSE="MIT"
20
SLOT="0"
21
IUSE="test"
22
RESTRICT="!test? ( test )"
23
24
DEPEND="
25
	dev-libs/libevdev
26
	dev-libs/libxml2
27
	media-libs/glm
28
"
29
RDEPEND="${DEPEND}"
30
BDEPEND="
31
	dev-libs/wayland-protocols
32
	virtual/pkgconfig
33
	test? ( dev-cpp/doctest )
34
"
35
36
src_configure() {
37
	local emesonargs=(
38
		$(meson_feature test tests)
39
	)
40
41
	meson_src_configure
42
}
(-)a/gui-wm/wayfire/Manifest (+1 lines)
Lines 1-2 Link Here
1
DIST wayfire-0.7.3.tar.xz 765524 BLAKE2B b82c66796d7fb3d07c7bd9078755b7c38df1bd5c93daa659fc98b1182679bc0a06a24b322c6ab492d06d30c898659e2ba849c1d5944260e8775a04fd8a5bd078 SHA512 7bb5b8492a632a9816e847ec72def74dc234bcc30da7c320a0cd3b1d60492f5521ad8ac76a12ef967d1b114bcde9be72eb8ffc618977aed8e198d4ace1e7056e
1
DIST wayfire-0.7.3.tar.xz 765524 BLAKE2B b82c66796d7fb3d07c7bd9078755b7c38df1bd5c93daa659fc98b1182679bc0a06a24b322c6ab492d06d30c898659e2ba849c1d5944260e8775a04fd8a5bd078 SHA512 7bb5b8492a632a9816e847ec72def74dc234bcc30da7c320a0cd3b1d60492f5521ad8ac76a12ef967d1b114bcde9be72eb8ffc618977aed8e198d4ace1e7056e
2
DIST wayfire-0.7.5.tar.xz 781952 BLAKE2B 10f4927d793ad2f8047ab5608db72bb5988fbb4df805dc65a87b011453729109ca0b3a92cf89e867266fae52268e1e2ac452bbd6efcc81e8f1a0c0640008adc1 SHA512 fce6d4c81fa3675df1e656f8bf504f7fc9d1b7104687bcc6d669950582f46bd0ad084c6a487434077df029438243cd91cf6ec60dc7d584b40bfd7a4c8d069f53
2
DIST wayfire-0.7.5.tar.xz 781952 BLAKE2B 10f4927d793ad2f8047ab5608db72bb5988fbb4df805dc65a87b011453729109ca0b3a92cf89e867266fae52268e1e2ac452bbd6efcc81e8f1a0c0640008adc1 SHA512 fce6d4c81fa3675df1e656f8bf504f7fc9d1b7104687bcc6d669950582f46bd0ad084c6a487434077df029438243cd91cf6ec60dc7d584b40bfd7a4c8d069f53
3
DIST wayfire-0.8.0.tar.xz 828576 BLAKE2B 4d80a0d43061a4564d45f7c077fd97737b426c4036c12f004815dbad120f51b38b2fac9a010e2df27a6a96205cd0dcceb81864bdccbd6e337d81f6c37926e019 SHA512 fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1d4444fdc8b1b898d998a9
(-)a/gui-wm/wayfire/wayfire-0.8.0.ebuild (-1 / +129 lines)
Line 0 Link Here
0
- 
1
# Copyright 2019-2023 Gentoo Authors
2
# Distributed under the terms of the GNU General Public License v2
3
4
EAPI=8
5
6
inherit meson toolchain-funcs
7
8
DESCRIPTION="compiz like 3D wayland compositor"
9
HOMEPAGE="https://github.com/WayfireWM/wayfire"
10
11
if [[ ${PV} == 9999 ]]; then
12
	inherit git-r3
13
	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
14
else
15
	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
16
	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
17
fi
18
19
LICENSE="MIT"
20
SLOT="0"
21
IUSE="debug +gles +system-wfconfig +system-wlroots X"
22
23
DEPEND="
24
	dev-libs/libinput:=
25
	dev-libs/wayland
26
	gui-libs/gtk-layer-shell
27
	media-libs/glm
28
	media-libs/mesa:=[gles2,wayland,X?]
29
	media-libs/libglvnd[X?]
30
	media-libs/libjpeg-turbo:=
31
	media-libs/libpng:=
32
	media-libs/freetype:=[X?]
33
	x11-libs/libdrm
34
	x11-libs/gtk+:3=[wayland,X?]
35
	x11-libs/cairo[X?,svg(+)]
36
	x11-libs/libxkbcommon[X?]
37
	x11-libs/pango
38
	x11-libs/pixman
39
	X? (
40
		x11-base/xwayland
41
		x11-libs/libxcb
42
	)
43
"
44
45
if [[ ${PV} == 9999 ]] ; then
46
	DEPEND+="
47
		system-wfconfig? ( ~gui-libs/wf-config-9999:= )
48
		!system-wfconfig? ( !gui-libs/wf-config )
49
		system-wlroots? ( ~gui-libs/wlroots-9999:=[drm(+),libinput(+),x11-backend,X?] )
50
		!system-wlroots? ( !gui-libs/wlroots )
51
	"
52
else
53
	DEPEND+="
54
		system-wfconfig? (
55
			>=gui-libs/wf-config-0.7.1
56
			<gui-libs/wf-config-0.8.0
57
		)
58
		!system-wfconfig? ( !gui-libs/wf-config )
59
		system-wlroots? (
60
			>=gui-libs/wlroots-0.16.0:0/16[drm(+),libinput(+),x11-backend,X?]
61
		)
62
		!system-wlroots? ( !gui-libs/wlroots )
63
	"
64
fi
65
66
RDEPEND="
67
	${DEPEND}
68
	x11-misc/xkeyboard-config
69
"
70
71
BDEPEND="
72
	dev-libs/wayland-protocols
73
	virtual/pkgconfig
74
"
75
76
if [[ ${PV} == 0.7.5 ]] ; then
77
	PATCHES=(
78
		"${FILESDIR}"/${PN}-0.7.5-gcc13.patch
79
	)
80
fi
81
82
src_configure() {
83
	# https://github.com/WayfireWM/wayfire/pull/1944
84
	sed -ie "s/'--short', 'HEAD'], check: true/'--short', 'HEAD'], check: false/" \
85
		"${WORKDIR}/${P}/meson.build"
86
	sed -ie "s/'--abbrev-ref', 'HEAD'], check: true/'--abbrev-ref', 'HEAD'], check: false/" \
87
		"${WORKDIR}/${P}/meson.build"
88
	#
89
	sed -e "s:@EPREFIX@:${EPREFIX}:" \
90
		"${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
91
	sed -e "s:@EPREFIX@:${EPREFIX}:" \
92
		"${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
93
	local emesonargs=(
94
		$(meson_feature system-wfconfig use_system_wfconfig)
95
		$(meson_feature system-wlroots use_system_wlroots)
96
		$(meson_feature X xwayland)
97
		$(meson_use gles enable_gles32)
98
		$(usex debug --buildtype=debug "")
99
		$(usex debug -Db_sanitize=address,undefined "")
100
	)
101
102
	# Clang will fail to link without this
103
	tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") )
104
105
	meson_src_configure
106
}
107
108
src_install() {
109
	meson_src_install
110
	dobin "${T}"/wayfire-session
111
112
	insinto "/usr/share/wayland-sessions/"
113
	insopts -m644
114
	doins wayfire.desktop
115
	doins "${T}"/wayfire-session.desktop
116
117
	insinto "/usr/share/wayfire/"
118
	doins wayfire.ini
119
}
120
121
pkg_postinst() {
122
	if [ -z "${REPLACING_VERSIONS}" ]; then
123
		elog "Wayfire has been installed but the session cannot be used"
124
		elog "until you install a configuration file. The default config"
125
		elog "file is installed at \"/usr/share/wayfire/wayfire.ini\""
126
		elog "To install the file execute"
127
		elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini"
128
	fi
129
}

Return to bug 915795