From cf23af1c4bef55a830a0c216dc39714cc46efbc9 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Sat, 20 Apr 2024 10:26:25 -0400 Subject: gui-wm/hyprland: add patch for bash completions Closes: https://bugs.gentoo.org/930132 Signed-off-by: Julien Roy Closes: https://github.com/gentoo/gentoo/pull/36331 Signed-off-by: Arthur Zamarin --- .../files/bash-completion-fix-0.39.1.patch | 22 ++++ gui-wm/hyprland/hyprland-0.39.1-r1.ebuild | 145 +++++++++++++++++++++ gui-wm/hyprland/hyprland-0.39.1.ebuild | 139 -------------------- 3 files changed, 167 insertions(+), 139 deletions(-) create mode 100644 gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch create mode 100644 gui-wm/hyprland/hyprland-0.39.1-r1.ebuild delete mode 100644 gui-wm/hyprland/hyprland-0.39.1.ebuild diff --git a/gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch b/gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch new file mode 100644 index 000000000000..fe48ce45dd3a --- /dev/null +++ b/gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch @@ -0,0 +1,22 @@ +https://github.com/hyprwm/Hyprland/pull/5653 + +--- a/hyprctl/meson.build ++++ b/hyprctl/meson.build +@@ -2,6 +2,6 @@ executable('hyprctl', 'main.cpp', + install: true + ) + +-install_data('hyprctl.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion'), install_tag: 'runtime', rename: 'hyprctl') ++install_data('hyprctl.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion/completions'), install_tag: 'runtime', rename: 'hyprctl') + install_data('hyprctl.fish', install_dir: join_paths(get_option('datadir'), 'fish/vendor_completions.d'), install_tag: 'runtime') + install_data('hyprctl.zsh', install_dir: join_paths(get_option('datadir'), 'zsh/site-functions'), install_tag: 'runtime', rename: '_hyprctl') +--- a/hyprpm/src/meson.build ++++ b/hyprpm/src/meson.build +@@ -9,6 +9,6 @@ executable('hyprpm', src, + install : true + ) + +-install_data('../hyprpm.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion'), install_tag: 'runtime', rename: 'hyprpm') ++install_data('../hyprpm.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion/completions'), install_tag: 'runtime', rename: 'hyprpm') + install_data('../hyprpm.fish', install_dir: join_paths(get_option('datadir'), 'fish/vendor_completions.d'), install_tag: 'runtime') + install_data('../hyprpm.zsh', install_dir: join_paths(get_option('datadir'), 'zsh/site-functions'), install_tag: 'runtime', rename: '_hyprpm') diff --git a/gui-wm/hyprland/hyprland-0.39.1-r1.ebuild b/gui-wm/hyprland/hyprland-0.39.1-r1.ebuild new file mode 100644 index 000000000000..6b1a6eff78b2 --- /dev/null +++ b/gui-wm/hyprland/hyprland-0.39.1-r1.ebuild @@ -0,0 +1,145 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson toolchain-funcs + +DESCRIPTION="A dynamic tiling Wayland compositor that doesn't sacrifice on its looks" +HOMEPAGE="https://github.com/hyprwm/Hyprland" + +if [[ "${PV}" = *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git" +else + SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz" + S="${WORKDIR}/${PN}-source" + + KEYWORDS="~amd64 ~riscv" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="X legacy-renderer systemd" + +# hyprpm (hyprland plugin manager) requires the dependencies at runtime +# so that it can clone, compile and install plugins. +HYPRPM_RDEPEND=" + app-alternatives/ninja + dev-build/cmake + dev-build/meson + dev-vcs/git + virtual/pkgconfig +" +# 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_DEPEND=" + >=dev-libs/wayland-1.22 + media-libs/libglvnd + media-libs/mesa[egl(+),gles2] + >=x11-libs/libdrm-2.4.114 + x11-libs/libxkbcommon + >=x11-libs/pixman-0.42.0 + media-libs/libdisplay-info + sys-apps/hwdata + >=dev-libs/libinput-1.14.0:= + sys-auth/seatd:= + virtual/libudev:= + X? ( + x11-libs/libxcb:= + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + x11-base/xwayland + ) +" +WLROOTS_RDEPEND=" + ${WLROOTS_DEPEND} +" +WLROOTS_BDEPEND=" + >=dev-libs/wayland-protocols-1.32 + dev-util/wayland-scanner + virtual/pkgconfig +" +RDEPEND=" + ${HYPRPM_RDEPEND} + ${WLROOTS_RDEPEND} + dev-cpp/tomlplusplus + dev-libs/glib:2 + dev-libs/libinput + >=dev-libs/wayland-1.20.0 + >=gui-libs/hyprcursor-0.1.7 + media-libs/libglvnd + x11-libs/cairo + x11-libs/libdrm + x11-libs/libxkbcommon + x11-libs/pango + x11-libs/pixman + X? ( + x11-libs/libxcb:0= + ) +" +DEPEND=" + ${RDEPEND} + ${WLROOTS_DEPEND} + >=dev-libs/hyprland-protocols-0.2 + >=dev-libs/hyprlang-0.3.2 + >=dev-libs/wayland-protocols-1.32 +" +BDEPEND=" + ${WLROOTS_BDEPEND} + || ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* ) + app-misc/jq + dev-build/cmake + dev-util/wayland-scanner + virtual/pkgconfig +" + +PATCHES=( + # https://bugs.gentoo.org/930132 + # https://github.com/hyprwm/Hyprland/pull/5653 + "${FILESDIR}/bash-completion-fix-0.39.1.patch" +) + +pkg_setup() { + [[ ${MERGE_TYPE} == binary ]] && return + + if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then + eerror "Hyprland requires >=sys-devel/gcc-13 to build" + eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc" + die "GCC version is too old to compile Hyprland!" + elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then + eerror "Hyprland requires >=sys-devel/clang-16 to build" + eerror "Please upgrade Clang: emerge -v1 sys-devel/clang" + die "Clang version is too old to compile Hyprland!" + fi +} + +src_configure() { + local emesonargs=( + $(meson_feature legacy-renderer legacy_renderer) + $(meson_feature systemd) + $(meson_feature X xwayland) + $(meson_feature X wlroots:xwayland) + -Dwlroots:backends=drm,libinput$(usev X ',x11') + -Dwlroots:xcb-errors=disabled + ) + + meson_src_configure +} + +src_install() { + # First install everything except wlroots to avoid conflicts. + meson_src_install --skip-subprojects wlroots + # Then install development files (mainly wlroots) for bug #916760. + meson_src_install --tags devel + + # Wlroots headers are required by hyprland-plugins and the pkgconfig file expects + # them to be in /usr/include/hyprland/wlroots, despite this they aren't installed there. + # Ideally you could override includedir per subproject and the install tags would + # be granular enough to only install headers. But its not requiring this. + mkdir "${ED}"/usr/include/hyprland/wlroots || die + mv "${ED}"/usr/include/wlr "${ED}"/usr/include/hyprland/wlroots || die + # devel tag includes wlroots .pc and .a files still + rm -rf "${ED}"/usr/$(get_libdir)/ || die +} diff --git a/gui-wm/hyprland/hyprland-0.39.1.ebuild b/gui-wm/hyprland/hyprland-0.39.1.ebuild deleted file mode 100644 index 3368e4aa15c2..000000000000 --- a/gui-wm/hyprland/hyprland-0.39.1.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson toolchain-funcs - -DESCRIPTION="A dynamic tiling Wayland compositor that doesn't sacrifice on its looks" -HOMEPAGE="https://github.com/hyprwm/Hyprland" - -if [[ "${PV}" = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git" -else - SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz" - S="${WORKDIR}/${PN}-source" - - KEYWORDS="~amd64 ~riscv" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="X legacy-renderer systemd" - -# hyprpm (hyprland plugin manager) requires the dependencies at runtime -# so that it can clone, compile and install plugins. -HYPRPM_RDEPEND=" - app-alternatives/ninja - dev-build/cmake - dev-build/meson - dev-vcs/git - virtual/pkgconfig -" -# 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_DEPEND=" - >=dev-libs/wayland-1.22 - media-libs/libglvnd - media-libs/mesa[egl(+),gles2] - >=x11-libs/libdrm-2.4.114 - x11-libs/libxkbcommon - >=x11-libs/pixman-0.42.0 - media-libs/libdisplay-info - sys-apps/hwdata - >=dev-libs/libinput-1.14.0:= - sys-auth/seatd:= - virtual/libudev:= - X? ( - x11-libs/libxcb:= - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - x11-base/xwayland - ) -" -WLROOTS_RDEPEND=" - ${WLROOTS_DEPEND} -" -WLROOTS_BDEPEND=" - >=dev-libs/wayland-protocols-1.32 - dev-util/wayland-scanner - virtual/pkgconfig -" -RDEPEND=" - ${HYPRPM_RDEPEND} - ${WLROOTS_RDEPEND} - dev-cpp/tomlplusplus - dev-libs/glib:2 - dev-libs/libinput - >=dev-libs/wayland-1.20.0 - >=gui-libs/hyprcursor-0.1.7 - media-libs/libglvnd - x11-libs/cairo - x11-libs/libdrm - x11-libs/libxkbcommon - x11-libs/pango - x11-libs/pixman - X? ( - x11-libs/libxcb:0= - ) -" -DEPEND=" - ${RDEPEND} - ${WLROOTS_DEPEND} - >=dev-libs/hyprland-protocols-0.2 - >=dev-libs/hyprlang-0.3.2 - >=dev-libs/wayland-protocols-1.32 -" -BDEPEND=" - ${WLROOTS_BDEPEND} - || ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* ) - app-misc/jq - dev-build/cmake - dev-util/wayland-scanner - virtual/pkgconfig -" - -pkg_setup() { - [[ ${MERGE_TYPE} == binary ]] && return - - if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then - eerror "Hyprland requires >=sys-devel/gcc-13 to build" - eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc" - die "GCC version is too old to compile Hyprland!" - elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then - eerror "Hyprland requires >=sys-devel/clang-16 to build" - eerror "Please upgrade Clang: emerge -v1 sys-devel/clang" - die "Clang version is too old to compile Hyprland!" - fi -} - -src_configure() { - local emesonargs=( - $(meson_feature legacy-renderer legacy_renderer) - $(meson_feature systemd) - $(meson_feature X xwayland) - $(meson_feature X wlroots:xwayland) - -Dwlroots:backends=drm,libinput$(usev X ',x11') - -Dwlroots:xcb-errors=disabled - ) - - meson_src_configure -} - -src_install() { - # First install everything except wlroots to avoid conflicts. - meson_src_install --skip-subprojects wlroots - # Then install development files (mainly wlroots) for bug #916760. - meson_src_install --tags devel - - # Wlroots headers are required by hyprland-plugins and the pkgconfig file expects - # them to be in /usr/include/hyprland/wlroots, despite this they aren't installed there. - # Ideally you could override includedir per subproject and the install tags would - # be granular enough to only install headers. But its not requiring this. - mkdir "${ED}"/usr/include/hyprland/wlroots || die - mv "${ED}"/usr/include/wlr "${ED}"/usr/include/hyprland/wlroots || die - # devel tag includes wlroots .pc and .a files still - rm -rf "${ED}"/usr/$(get_libdir)/ || die -} -- cgit v1.2.3-65-gdbad