From 4a737d6e4b386b7e43cec016261fefb993d9faf9 Mon Sep 17 00:00:00 2001 From: Alarig Le Lay Date: Fri, 3 May 2024 20:02:01 +0200 Subject: [PATCH] x11-libs/vte: add 0.74.2, drop 0.70.2 --- x11-libs/vte/Manifest | 3 ++- .../{vte-0.70.2.ebuild => vte-0.74.2.ebuild} | 25 ++++++++++++------- 2 files changed, 18 insertions(+), 10 deletions(-) rename x11-libs/vte/{vte-0.70.2.ebuild => vte-0.74.2.ebuild} (79%) diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest index 601993c..d28dffa 100644 --- a/x11-libs/vte/Manifest +++ b/x11-libs/vte/Manifest @@ -1,3 +1,4 @@ DIST vte-0.70.0-command-notify.patch.xz 9040 BLAKE2B 108dd05d00409af90b1fd3e9b5c3b0e5586ac80204cef8840fda935204cbc480fec1193e2a0a2782f98e2b094c3caebbfe61cf18631b16921df05cf3808afd22 SHA512 92123e7f5cb6ef876f2b2b108dbef59bce212efebd64cd790d49d9ee3215344acd848eec5d326fe2c3bd236846ed3b896148024390093491b2f6e2f7c46e2bd1 -DIST vte-0.70.2.tar.bz2 502395 BLAKE2B ae127d8262c7038b3a2cda9a9622e9a075dfc1e06a7710810a4bb894a6646155790776553f663677cb86c3479e6d3faf92c38b5b97dd6970df37cee92dd963fa SHA512 1e113da0591830c057358dd78cfe2f814dd0bfabd037973369266823a9a4936a200b5b23faab3757ced4d08aa96a76d6b1120419815a181598493e35d2ea58d0 DIST vte-0.70.3.tar.bz2 502706 BLAKE2B 1fee46dee38618137781d62b27730893b0c6969cf3badfa157628621a608983be48e35ef4d8e58099c93b8be91434b257d120cab2e7a943cfecaf37ff7b3fd5d SHA512 5520bc58b0ad2f803da27985e30862de987ecc31c0137895c6945c53f99a7c16ee0281646b9e04362de934364ee7beaa1acf47dad9baf5a16ab9898d5f746d2d +DIST vte-0.74.0-command-notify.patch.xz 9248 BLAKE2B 30917bc72d2b3fd917178f49c26f023d40d37e9a44a896c44e55345396d0bfdb1b109f8b2fdead96c31f92f5febcc397f2899511647c3adf3c2aace2be8ffa94 SHA512 fc0bb3cfa70fc5e1384c44fcce6d6a76957d0dd72f61a882d9df22d55dd06fcee4e7bd2a136c443158fe403992befe5d7ce5970b8b657b690b3875ff5171ea83 +DIST vte-0.74.2.tar.bz2 505422 BLAKE2B 243eabfb26c0ec65d0b202437ae79265440256941dae4263e9d6dc9afea24d0fbbd7d421864a90b54d2ba953cd60a2b5a41aef9fb9e53396176bcc71400eef82 SHA512 203dd0f8606b8979cde01781412e0dbab3cb8857828e55f6d69ecfc2e4d58d53430aa5c61a2203e122c772ba1f6c5b739d3c03456b133580e76d511d67f3f534 diff --git a/x11-libs/vte/vte-0.70.2.ebuild b/x11-libs/vte/vte-0.74.2.ebuild similarity index 79% rename from x11-libs/vte/vte-0.70.2.ebuild rename to x11-libs/vte/vte-0.74.2.ebuild index 8a8f8ed..065e644 100644 --- a/x11-libs/vte/vte-0.70.2.ebuild +++ b/x11-libs/vte/vte-0.74.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit gnome.org meson python-any-r1 vala xdg +inherit flag-o-matic gnome.org meson python-any-r1 vala xdg DESCRIPTION="Library providing a virtual terminal emulator widget" HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE" @@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE" LICENSE="LGPL-3+ GPL-3+" SLOT="2.91" # vte_api_version in meson.build IUSE="+crypt debug gtk-doc +icu +introspection mouse systemd +vala vanilla" -KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" REQUIRED_USE=" gtk-doc? ( introspection ) vala? ( introspection ) @@ -21,12 +21,13 @@ REQUIRED_USE=" # Upstream is hostile and refuses to upload tarballs. SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2" -SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.70.0-command-notify.patch.xz )" +SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.74.0-command-notify.patch.xz )" DEPEND=" >=x11-libs/gtk+-3.24.22:3[introspection?] + >=x11-libs/cairo-1.0 >=dev-libs/fribidi-1.0.0 - >=dev-libs/glib-2.52:2 + >=dev-libs/glib-2.60:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 @@ -57,9 +58,9 @@ src_prepare() { use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch if ! use vanilla; then - # Part of https://src.fedoraproject.org/rpms/vte291/raw/f37/f/vte291-cntnr-precmd-preexec-scroll.patch + # From https://src.fedoraproject.org/rpms/vte291/raw/rawhide/f/vte291-cntnr-precmd-preexec-scroll.patch # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere - eapply "${WORKDIR}"/${PN}-0.70.0-command-notify.patch + eapply "${WORKDIR}"/${PN}-0.74.0-command-notify.patch fi if ! use mouse; then @@ -72,6 +73,9 @@ src_prepare() { } src_configure() { + # Upstream don't support LTO & error out on it in meson.build (bug #926156) + filter-lto + local emesonargs=( -Da11y=true $(meson_use debug debugg) @@ -90,7 +94,10 @@ src_configure() { } src_install() { - meson_install # not meson_src_install because this would include einstalldocs, which would result in file collisions with gui-libs/vte + # not meson_src_install because this would include einstalldocs, which + # would result in file collisions with gui-libs/vte + meson_install + # Remove files that are provided by gui-libs/vte-common rm "${ED}"/usr/libexec/vte-urlencode-cwd || die rm "${ED}"/etc/profile.d/vte.sh || die