From 9fae5c00a6a0f31cff070bc9605c3ee4fc165dae Mon Sep 17 00:00:00 2001 From: Alexis Date: Sun, 15 Oct 2023 15:05:12 +1100 Subject: [PATCH] Update to {wf-config,wayfire,wayfire-plugins-extra}-0.8.0. Signed-off-by: Alexis --- gui-libs/wayfire-plugins-extra/Manifest | 1 + .../wayfire-plugins-extra-0.8.0.ebuild | 36 +++++ gui-libs/wf-config/Manifest | 1 + gui-libs/wf-config/wf-config-0.8.0.ebuild | 42 ++++++ gui-wm/wayfire/Manifest | 1 + gui-wm/wayfire/wayfire-0.8.0.ebuild | 135 ++++++++++++++++++ 6 files changed, 216 insertions(+) create mode 100644 gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.8.0.ebuild create mode 100644 gui-libs/wf-config/wf-config-0.8.0.ebuild create mode 100644 gui-wm/wayfire/wayfire-0.8.0.ebuild diff --git a/gui-libs/wayfire-plugins-extra/Manifest b/gui-libs/wayfire-plugins-extra/Manifest index 7331f5a979..978b46064a 100644 --- a/gui-libs/wayfire-plugins-extra/Manifest +++ b/gui-libs/wayfire-plugins-extra/Manifest @@ -1,2 +1,3 @@ DIST wayfire-plugins-extra-0.7.0.tar.xz 74312 BLAKE2B f72d706502499e4d467a4b59e10f66628024be1bab1c5e10c807758869c9b9e4aacbe426c2db0e3faa5ab166f7e4f4d0f1c345e205c6747a16a164745c6f0d74 SHA512 ff25a4685c88ca0129a2372b216166246cab072c2cb4f84eb7bd500db525bf5881bd7e54d0d888473d4aab0e5b33d2ee13eb7f788bb2a524e1e8e0c5efc1a6bd DIST wayfire-plugins-extra-0.7.5.tar.xz 75136 BLAKE2B 7ffbb73f09175cc92f09b8a3f0493942741564278f95ff1d80066044b02ce4ceb925919ddb54fc6a37676b925d95ea7f93d09c6b0ccd448c6e9b821106d6e3ea SHA512 9cc816c3c727b0093fd15ef52dea215598b4c49ef96c098f53938c041b3908b30f4dd616be4b459b7382d630a47b36baf845c24de84f35670ba2912711205911 +DIST wayfire-plugins-extra-0.8.0.tar.xz 70324 BLAKE2B f8f46782e31f170eb566567f50d302df4db23fbeb29c71569624a7f79c2bbcfcf48b070e7b55bf1880a9cd02afe78783d6680c457e466d765eb0db72f4b1f61b SHA512 8105fea3d8405a88d8c872c1012dadfab55f987a8ff8401f5caeec155214727021cbc7cfaba71c5ee3bc869caf136dcd78c189921c2f41a938b8552962f1597c diff --git a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.8.0.ebuild b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.8.0.ebuild new file mode 100644 index 0000000000..c0a8a93d13 --- /dev/null +++ b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.8.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="extra plugins for wayfire" +HOMEPAGE="https://github.com/WayfireWM/wayfire-plugins-extra" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/WayfireWM/wayfire-plugins-extra.git" +else + SRC_URI="https://github.com/WayfireWM/wayfire-plugins-extra/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~arm64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +DEPEND=" + dev-cpp/glibmm:2 + x11-libs/pixman + gnome-base/librsvg + >=gui-libs/wlroots-0.16.0:0/16 + =gui-wm/wayfire-0.7.5 + x11-libs/cairo + x11-libs/pixman +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-libs/wayland-protocols + virtual/pkgconfig +" diff --git a/gui-libs/wf-config/Manifest b/gui-libs/wf-config/Manifest index 15f9e410c0..1959ca230d 100644 --- a/gui-libs/wf-config/Manifest +++ b/gui-libs/wf-config/Manifest @@ -1 +1,2 @@ DIST wf-config-0.7.1.tar.xz 39120 BLAKE2B b18048334df12b002391fe4a74529cb61df76a0678c9052f8ac91d777e8a48dae46b87680fb44630ebfb9a350dbac36b15bc81850341fa4cd6299c12f6fa057d SHA512 d535a09a3465a54a607df7b8764ee6818ab8b83536d68c85167b282b95a176636e4bf5cda6c0d1638c07721a1f4208203e9d41b83675038fb590a535314df719 +DIST wf-config-0.8.0.tar.xz 41200 BLAKE2B d56cd04c18c2cd8c0bac86493ad662244bde0e9cce1caf81d0fff34d9f2df2470c1aa8c95fead9e91dd5793d570b01dc6ef99b1986b8658b06ef93156a1526f8 SHA512 79cca2429a39ee81f853043698c57fc08025634926773253cff73fc564dcf203335b4b861d82b60a769bbab7b07be6a7e181c9ea29ad98ce930de20f9723893f diff --git a/gui-libs/wf-config/wf-config-0.8.0.ebuild b/gui-libs/wf-config/wf-config-0.8.0.ebuild new file mode 100644 index 0000000000..a223d4b990 --- /dev/null +++ b/gui-libs/wf-config/wf-config-0.8.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +DESCRIPTION="library for managing wayfire configuration files" +HOMEPAGE="https://github.com/WayfireWM/wf-config" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/WayfireWM/wf-config.git" +else + SRC_URI="https://github.com/WayfireWM/wf-config/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~arm64 ~riscv ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/libevdev + dev-libs/libxml2 + media-libs/glm +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-libs/wayland-protocols + virtual/pkgconfig + test? ( dev-cpp/doctest ) +" + +src_configure() { + local emesonargs=( + $(meson_feature test tests) + ) + + meson_src_configure +} diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index b0f036b8be..1d54c8fd01 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1,2 +1,3 @@ DIST wayfire-0.7.3.tar.xz 765524 BLAKE2B b82c66796d7fb3d07c7bd9078755b7c38df1bd5c93daa659fc98b1182679bc0a06a24b322c6ab492d06d30c898659e2ba849c1d5944260e8775a04fd8a5bd078 SHA512 7bb5b8492a632a9816e847ec72def74dc234bcc30da7c320a0cd3b1d60492f5521ad8ac76a12ef967d1b114bcde9be72eb8ffc618977aed8e198d4ace1e7056e DIST wayfire-0.7.5.tar.xz 781952 BLAKE2B 10f4927d793ad2f8047ab5608db72bb5988fbb4df805dc65a87b011453729109ca0b3a92cf89e867266fae52268e1e2ac452bbd6efcc81e8f1a0c0640008adc1 SHA512 fce6d4c81fa3675df1e656f8bf504f7fc9d1b7104687bcc6d669950582f46bd0ad084c6a487434077df029438243cd91cf6ec60dc7d584b40bfd7a4c8d069f53 +DIST wayfire-0.8.0.tar.xz 828576 BLAKE2B 4d80a0d43061a4564d45f7c077fd97737b426c4036c12f004815dbad120f51b38b2fac9a010e2df27a6a96205cd0dcceb81864bdccbd6e337d81f6c37926e019 SHA512 fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1d4444fdc8b1b898d998a9 diff --git a/gui-wm/wayfire/wayfire-0.8.0.ebuild b/gui-wm/wayfire/wayfire-0.8.0.ebuild new file mode 100644 index 0000000000..222d3e2ab8 --- /dev/null +++ b/gui-wm/wayfire/wayfire-0.8.0.ebuild @@ -0,0 +1,135 @@ +# Copyright 2019-2023 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} == 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="debug +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/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 +" + +if [[ ${PV} == 0.7.5 ]] ; then + PATCHES=( + "${FILESDIR}"/${PN}-0.7.5-gcc13.patch + ) +fi + +src_configure() { + # https://github.com/WayfireWM/wayfire/pull/1944 + sed -ie "s/'--short', 'HEAD'], check: true/'--short', 'HEAD'], check: false/" \ + "${WORKDIR}/${P}/meson.build" + sed -ie "s/'--abbrev-ref', 'HEAD'], check: true/'--abbrev-ref', 'HEAD'], check: false/" \ + "${WORKDIR}/${P}/meson.build" + # + 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 + + # + sed -ie "s|install_dir: 'man'|install_dir: 'share/man'|" \ + "${WORKDIR}/${P}/man/meson.build" + + # + 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) + $(usex debug --buildtype=debug "") + $(usex debug -Db_sanitize=address,undefined "") + ) + + # Clang will fail to link without this + tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") ) + + 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 +} -- 2.41.0