diff options
author | Alfred Wingate <parona@protonmail.com> | 2024-03-14 13:47:56 +0200 |
---|---|---|
committer | Arthur Zamarin <arthurzam@gentoo.org> | 2024-03-16 21:18:09 +0200 |
commit | 25e6c5f39257e9bbfb166f763a2c18000c0fc1b6 (patch) | |
tree | 054beed823537c42af73ad982f08697c016c1b81 /gui-wm | |
parent | gui-wm/wayfire: update live ebuild (diff) | |
download | gentoo-25e6c5f39257e9bbfb166f763a2c18000c0fc1b6.tar.gz gentoo-25e6c5f39257e9bbfb166f763a2c18000c0fc1b6.tar.bz2 gentoo-25e6c5f39257e9bbfb166f763a2c18000c0fc1b6.zip |
gui-wm/wayfire: drop 0.7.5-r1, 0.8.0
Signed-off-by: Alfred Wingate <parona@protonmail.com>
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
Diffstat (limited to 'gui-wm')
-rw-r--r-- | gui-wm/wayfire/Manifest | 1 | ||||
-rw-r--r-- | gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch | 25 | ||||
-rw-r--r-- | gui-wm/wayfire/wayfire-0.7.5-r1.ebuild | 116 | ||||
-rw-r--r-- | gui-wm/wayfire/wayfire-0.8.0.ebuild | 153 |
4 files changed, 0 insertions, 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 fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1d4444fdc8b1b898d998a9 DIST wayfire-0.8.1.tar.xz 856364 BLAKE2B 1b596b28878789ca26eeb57c6c24e0b69508731de2144e1477f8071b41f17757b2125f2f4f99670ca8b7f85172a9f641b9be1f9190eeff5b261bcc2df1bec4ab SHA512 7bce5656b6a7a7fe53b37492465dee3e591eb386666fdd3d6876f4a589f059510fb2d0c0a326df260ca6a293edf4ba43bb55f813e85d4d2d38d6ef1319280254 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 0ee666664c93..000000000000 --- 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 <sam@gentoo.org> -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 <cstddef> -+#include <cstdint> - #include <functional> - #include <memory> - #include <sstream> - 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..000000000000 --- 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} == 9999 ]]; 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} == 9999 ]] ; then - DEPEND+=" - system-wfconfig? ( ~gui-libs/wf-config-9999:= ) - !system-wfconfig? ( !gui-libs/wf-config ) - system-wlroots? ( ~gui-libs/wlroots-9999:=[drm(+),libinput(+),x11-backend,X?] ) - !system-wlroots? ( !gui-libs/wlroots ) - " -else - DEPEND+=" - system-wfconfig? ( - >=gui-libs/wf-config-0.7.1 - <gui-libs/wf-config-0.8.0 - ) - !system-wfconfig? ( !gui-libs/wf-config ) - system-wlroots? ( - >=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 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.7.5-gcc13.patch -) - -src_configure() { - sed -e "s:@EPREFIX@:${EPREFIX}:" \ - "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die - sed -e "s:@EPREFIX@:${EPREFIX}:" \ - "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die - local emesonargs=( - $(meson_feature system-wfconfig use_system_wfconfig) - $(meson_feature system-wlroots use_system_wlroots) - $(meson_feature X xwayland) - $(meson_use gles enable_gles32) - ) - - 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 -} - -pkg_postinst() { - if [ -z "${REPLACING_VERSIONS}" ]; then - elog "Wayfire has been installed but the session cannot be used" - elog "until you install a configuration file. The default config" - elog "file is installed at \"/usr/share/wayfire/wayfire.ini\"" - elog "To install the file execute" - elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini" - fi -} diff --git a/gui-wm/wayfire/wayfire-0.8.0.ebuild b/gui-wm/wayfire/wayfire-0.8.0.ebuild deleted file mode 100644 index 15e5598edc0f..000000000000 --- a/gui-wm/wayfire/wayfire-0.8.0.ebuild +++ /dev/null @@ -1,153 +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/9999" -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="+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} == 9999 ]] ; then - CDEPEND+=" - system-wlroots? ( gui-libs/wlroots:0/9999[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} ) -" - -src_prepare() { - eapply_user - - sed -e "s:@EPREFIX@:${EPREFIX}:" \ - "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die - sed -e "s:@EPREFIX@:${EPREFIX}:" \ - "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die - - if [[ "${PV}" != 9999 ]]; then - # Don't run git if git is installed and its not a git dir - sed -i \ - -e "/git = find_program/ifs = import\('fs'\)" \ - -e "s/if git.found()/if git.found() and fs.is_dir('.git')/" \ - meson.build || die - fi - -} - -src_configure() { - local emesonargs=( - $(meson_feature system-wfconfig use_system_wfconfig) - $(meson_feature system-wlroots use_system_wlroots) - $(meson_feature test tests) - $(meson_feature X xwayland) - $(meson_use gles enable_gles32) - ) - - 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 -} - -pkg_postinst() { - if [ -z "${REPLACING_VERSIONS}" ]; then - elog "Wayfire has been installed but the session cannot be used" - elog "until you install a configuration file. The default config" - elog "file is installed at \"/usr/share/wayfire/wayfire.ini\"" - elog "To install the file execute" - elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini" - fi -} |