| 1 |
commit: c685f0536fa2c041527be681eb93800c8afbde77 |
| 2 |
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> |
| 3 |
AuthorDate: Wed Aug 5 09:41:20 2020 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 17 01:36:06 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c685f053 |
| 7 |
|
| 8 |
gui-wm/wayfire: version bump to 0.5.0 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/728880 |
| 11 |
Closes: https://bugs.gentoo.org/728504 |
| 12 |
|
| 13 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 14 |
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> |
| 15 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
| 16 |
|
| 17 |
gui-wm/wayfire/Manifest | 1 + |
| 18 |
.../{wayfire-9999.ebuild => wayfire-0.5.0.ebuild} | 26 +++++++++++----------- |
| 19 |
gui-wm/wayfire/wayfire-9999.ebuild | 26 +++++++++++----------- |
| 20 |
3 files changed, 27 insertions(+), 26 deletions(-) |
| 21 |
|
| 22 |
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest |
| 23 |
index f03e463761b..cbc0a80a9bc 100644 |
| 24 |
--- a/gui-wm/wayfire/Manifest |
| 25 |
+++ b/gui-wm/wayfire/Manifest |
| 26 |
@@ -1 +1,2 @@ |
| 27 |
DIST wayfire-0.4.0.tar.xz 588904 BLAKE2B b720297b3ffb868761ea61615b4d0fefc2687f8a2060208f8cc002ff7adaf7622da906ad98e25664c3e72c04de2fb74741d0a417cce4826483407bdf10d63b43 SHA512 e96cdb90ce36c005476e08608683983aa167e58aea80fcfd3b24ab0836ec4aa50fb5a7eeb0872a1b1014e3073ed826e1c83d3146b39d3cdb2a8b3a0895155649 |
| 28 |
+DIST wayfire-0.5.0.tar.xz 670680 BLAKE2B 6a1555669352dd1303f7472db4fbb8ada6173c09825f4e999a2862787bd5bf31e070e9e12110249b9407d8c380235f4a9d3c5be6b23defe36094822526eed6ef SHA512 9c2d116a5d6e77e37b0e4eef26624d43d6ab3a80e56e19a2de1fdd28a2a522c24b9e346eb4529848f3b2c3668460a51f428a0c196286ec8300e4823250eae811 |
| 29 |
|
| 30 |
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-0.5.0.ebuild |
| 31 |
similarity index 72% |
| 32 |
copy from gui-wm/wayfire/wayfire-9999.ebuild |
| 33 |
copy to gui-wm/wayfire/wayfire-0.5.0.ebuild |
| 34 |
index 3a3d136e62b..f2df4accbaa 100644 |
| 35 |
--- a/gui-wm/wayfire/wayfire-9999.ebuild |
| 36 |
+++ b/gui-wm/wayfire/wayfire-0.5.0.ebuild |
| 37 |
@@ -18,7 +18,7 @@ fi |
| 38 |
|
| 39 |
LICENSE="MIT" |
| 40 |
SLOT="0" |
| 41 |
-IUSE="+gles +system-wfconfig +system-wlroots elogind systemd" |
| 42 |
+IUSE="+gles +system-wfconfig +system-wlroots elogind systemd X" |
| 43 |
REQUIRED_USE="?? ( elogind systemd )" |
| 44 |
|
| 45 |
DEPEND=" |
| 46 |
@@ -26,19 +26,19 @@ DEPEND=" |
| 47 |
dev-libs/libinput |
| 48 |
gui-libs/gtk-layer-shell |
| 49 |
media-libs/glm |
| 50 |
- media-libs/mesa:=[gles2,wayland,X] |
| 51 |
+ media-libs/mesa:=[gles2,wayland,X?] |
| 52 |
media-libs/libjpeg-turbo |
| 53 |
media-libs/libpng |
| 54 |
- media-libs/freetype:=[X] |
| 55 |
+ media-libs/freetype:=[X?] |
| 56 |
x11-libs/libdrm |
| 57 |
- x11-libs/gtk+:3=[wayland,X] |
| 58 |
- x11-libs/cairo:=[X,svg] |
| 59 |
- x11-libs/libxkbcommon:=[X] |
| 60 |
+ x11-libs/gtk+:3=[wayland,X?] |
| 61 |
+ x11-libs/cairo:=[X?,svg] |
| 62 |
+ X? ( x11-libs/libxkbcommon:=[X] ) |
| 63 |
x11-libs/pixman |
| 64 |
- gles? ( media-libs/libglvnd[X] ) |
| 65 |
- system-wfconfig? ( ~gui-libs/wf-config-${PV} ) |
| 66 |
+ gles? ( media-libs/libglvnd[X?] ) |
| 67 |
+ system-wfconfig? ( >=gui-libs/wf-config-${PV} ) |
| 68 |
!system-wfconfig? ( !gui-libs/wf-config ) |
| 69 |
- system-wlroots? ( ~gui-libs/wlroots-9999[elogind=,systemd=,X] ) |
| 70 |
+ system-wlroots? ( >=gui-libs/wlroots-0.11.0[elogind=,systemd=,X?] ) |
| 71 |
!system-wlroots? ( !gui-libs/wlroots ) |
| 72 |
" |
| 73 |
|
| 74 |
@@ -50,15 +50,15 @@ RDEPEND=" |
| 75 |
" |
| 76 |
|
| 77 |
BDEPEND=" |
| 78 |
- ${DEPEND} |
| 79 |
+ dev-libs/wayland-protocols |
| 80 |
virtual/pkgconfig |
| 81 |
- >=dev-libs/wayland-protocols-1.18 |
| 82 |
" |
| 83 |
|
| 84 |
src_configure() { |
| 85 |
local emesonargs=( |
| 86 |
$(meson_feature system-wfconfig use_system_wfconfig) |
| 87 |
$(meson_feature system-wlroots use_system_wlroots) |
| 88 |
+ $(meson_feature X xwayland) |
| 89 |
$(meson_use gles enable_gles32) |
| 90 |
) |
| 91 |
meson_src_configure |
| 92 |
@@ -85,8 +85,8 @@ pkg_postinst() { |
| 93 |
if [ -z "${REPLACING_VERSIONS}" ]; then |
| 94 |
elog "Wayfire has been installed but the session cannot be used" |
| 95 |
elog "until you install a configuration file. The default config" |
| 96 |
- elog "file is installed at \"/usr/share/doc/${P}/wayfire.ini.bz2\"" |
| 97 |
+ elog "file is installed at \"/usr/share/doc/${PF}/wayfire.ini.bz2\"" |
| 98 |
elog "To install the file execute" |
| 99 |
- elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${P}/wayfire.ini.bz2 > ~/.config/wayfire.ini" |
| 100 |
+ elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${PF}/wayfire.ini.bz2 > ~/.config/wayfire.ini" |
| 101 |
fi |
| 102 |
} |
| 103 |
|
| 104 |
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild |
| 105 |
index 3a3d136e62b..f2df4accbaa 100644 |
| 106 |
--- a/gui-wm/wayfire/wayfire-9999.ebuild |
| 107 |
+++ b/gui-wm/wayfire/wayfire-9999.ebuild |
| 108 |
@@ -18,7 +18,7 @@ fi |
| 109 |
|
| 110 |
LICENSE="MIT" |
| 111 |
SLOT="0" |
| 112 |
-IUSE="+gles +system-wfconfig +system-wlroots elogind systemd" |
| 113 |
+IUSE="+gles +system-wfconfig +system-wlroots elogind systemd X" |
| 114 |
REQUIRED_USE="?? ( elogind systemd )" |
| 115 |
|
| 116 |
DEPEND=" |
| 117 |
@@ -26,19 +26,19 @@ DEPEND=" |
| 118 |
dev-libs/libinput |
| 119 |
gui-libs/gtk-layer-shell |
| 120 |
media-libs/glm |
| 121 |
- media-libs/mesa:=[gles2,wayland,X] |
| 122 |
+ media-libs/mesa:=[gles2,wayland,X?] |
| 123 |
media-libs/libjpeg-turbo |
| 124 |
media-libs/libpng |
| 125 |
- media-libs/freetype:=[X] |
| 126 |
+ media-libs/freetype:=[X?] |
| 127 |
x11-libs/libdrm |
| 128 |
- x11-libs/gtk+:3=[wayland,X] |
| 129 |
- x11-libs/cairo:=[X,svg] |
| 130 |
- x11-libs/libxkbcommon:=[X] |
| 131 |
+ x11-libs/gtk+:3=[wayland,X?] |
| 132 |
+ x11-libs/cairo:=[X?,svg] |
| 133 |
+ X? ( x11-libs/libxkbcommon:=[X] ) |
| 134 |
x11-libs/pixman |
| 135 |
- gles? ( media-libs/libglvnd[X] ) |
| 136 |
- system-wfconfig? ( ~gui-libs/wf-config-${PV} ) |
| 137 |
+ gles? ( media-libs/libglvnd[X?] ) |
| 138 |
+ system-wfconfig? ( >=gui-libs/wf-config-${PV} ) |
| 139 |
!system-wfconfig? ( !gui-libs/wf-config ) |
| 140 |
- system-wlroots? ( ~gui-libs/wlroots-9999[elogind=,systemd=,X] ) |
| 141 |
+ system-wlroots? ( >=gui-libs/wlroots-0.11.0[elogind=,systemd=,X?] ) |
| 142 |
!system-wlroots? ( !gui-libs/wlroots ) |
| 143 |
" |
| 144 |
|
| 145 |
@@ -50,15 +50,15 @@ RDEPEND=" |
| 146 |
" |
| 147 |
|
| 148 |
BDEPEND=" |
| 149 |
- ${DEPEND} |
| 150 |
+ dev-libs/wayland-protocols |
| 151 |
virtual/pkgconfig |
| 152 |
- >=dev-libs/wayland-protocols-1.18 |
| 153 |
" |
| 154 |
|
| 155 |
src_configure() { |
| 156 |
local emesonargs=( |
| 157 |
$(meson_feature system-wfconfig use_system_wfconfig) |
| 158 |
$(meson_feature system-wlroots use_system_wlroots) |
| 159 |
+ $(meson_feature X xwayland) |
| 160 |
$(meson_use gles enable_gles32) |
| 161 |
) |
| 162 |
meson_src_configure |
| 163 |
@@ -85,8 +85,8 @@ pkg_postinst() { |
| 164 |
if [ -z "${REPLACING_VERSIONS}" ]; then |
| 165 |
elog "Wayfire has been installed but the session cannot be used" |
| 166 |
elog "until you install a configuration file. The default config" |
| 167 |
- elog "file is installed at \"/usr/share/doc/${P}/wayfire.ini.bz2\"" |
| 168 |
+ elog "file is installed at \"/usr/share/doc/${PF}/wayfire.ini.bz2\"" |
| 169 |
elog "To install the file execute" |
| 170 |
- elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${P}/wayfire.ini.bz2 > ~/.config/wayfire.ini" |
| 171 |
+ elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${PF}/wayfire.ini.bz2 > ~/.config/wayfire.ini" |
| 172 |
fi |
| 173 |
} |
Archives