commit: f5878cd420f624ada420b4563303c6e462940ab3 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Fri Apr 7 22:58:58 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri Apr 7 23:05:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5878cd4
x11-terms/gnome-terminal: Un-force USE=vanilla Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> profiles/base/package.use.force | 4 ---- x11-terms/gnome-terminal/Manifest | 3 ++- x11-terms/gnome-terminal/gnome-terminal-3.46.8.ebuild | 4 ++-- x11-terms/gnome-terminal/gnome-terminal-3.48.0.ebuild | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index ffc3b6f06ec7..943f70b314ee 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -1,10 +1,6 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Matt Turner <matts...@gentoo.org> (2022-12-02) -# The patch we apply from Fedora doesn't apply. ->x11-terms/gnome-terminal-3.46.3 vanilla - # Patrick McLean <chutz...@gentoo.org> (2022-06-27) # Doesn't build with boost installed on the system, some deps require boost # so force the flag on until problem fixed upstream diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest index 429773bc3e4d..5bdd0fc2aaa0 100644 --- a/x11-terms/gnome-terminal/Manifest +++ b/x11-terms/gnome-terminal/Manifest @@ -1,5 +1,6 @@ DIST gnome-terminal-3.44.0-cntr-ntfy-autottl-ts.patch.xz 37248 BLAKE2B b3599386e7272fc5b742c11663f09bbfafa84cc855bd13fd602d679601fbb4126f36cdb157db37db335bf9edfe7d2b85e534baf837c5817984ec17baa4cdbb6c SHA512 6422a774abfee18b2681115344f508b72ead1bb9f27b5b1596b419a9ce5a137d41e2d749b6d784170225e7f21f15c109f7eb74cc3164371d53dee7790bf99187 DIST gnome-terminal-3.44.1.tar.xz 1813032 BLAKE2B 3e001139aa0516bd27f7215c692c048393d6ad41737b8817f212529d3c530f6417d05601f63e6265e3fb84e788322341c25784a0a26ee7434f1d4bccd31c1eea SHA512 afaa9a1b4fa86fea853a242f167d1ba3438efe4e049336bae138cb800d43c3325f624849463f16c9d4e34360916377c4edbfd2f3977212b51e35a41cca88b283 -DIST gnome-terminal-3.46.2-cntr-ntfy-autottl-ts.patch.xz 34980 BLAKE2B 97a634da8f586fe03770540a00480f04de5d3210bb45e9af216ac876a85a8199d2d9ed651cae6631a0b432c96d28b5a07202baf79765a2b3767160c1df5cb84a SHA512 96591f7e1f4febfce9d8b10a0fc8aebc09ad07cb2fb36876affaa47f19360944c37e63c173af6f07807247c6f60f34e4e39590ccb1632a64d6e5dbf3912bea74 +DIST gnome-terminal-3.46.8-cntr-ntfy-autottl-ts.patch.xz 35244 BLAKE2B 4a3166b2a73f97d8dc313b95f0ec0f101bedf03fadd3fb6e5f4564002818819fd91f4ad1f8f664e62955dad677b057b79f2fa399b35b1b8436fc541d6b6fb876 SHA512 a6a7346eae0e788beeeb25daecd37374ebe5b6679c1435db2414c144fb017e8f7f7875a2e8dddce22e2a13534ead4c3f6487e5033cb3279dfaadc32044ca367b DIST gnome-terminal-3.46.8.tar.bz2 1691033 BLAKE2B efcf6aa6ab0071fd525e2b5d56bb7a6e53bd8072a5c774c3cab7b52f613e60112a5fccebbf6354953acf3a76182d60f9abc2f7122eef017e4a543a68d21b76f1 SHA512 07b8b9a31d5c1f87ff6d9902b56bfe1eb75b32f25e5b5c97448f990f4c4d6ca73709e5af30e09701d2dc55331a33b6f006fdcc696d5c9ffa83e50919ac74fdfc +DIST gnome-terminal-3.48.0-cntr-ntfy-autottl-ts.patch.xz 37800 BLAKE2B 51c7ab8274b8d4ed2ce9a037b9131d728f76ab11d1dc8aec0c66f98905dfdd27c88a99ae655dab73fbf977a594e12e248170291038f49d225b9e102d3929236d SHA512 187c95f9be287beca43ced2143526920e10c3e67a19463c86d3db298191290b5905922656ad315821ab6cf19b81e2b17252f1b150e4e904db93f13ac7b4aa0d2 DIST gnome-terminal-3.48.0.tar.bz2 1697733 BLAKE2B 2b35fe6e3dc2e25befe7f5f18654f5d69c27aa08ae0bf3562920562e2a9886ea4956e00a3111ef565c2cd0cc8fc7b6fc5fc7c688891e0921d8cd23355ddc6995 SHA512 337df221b9c61159e00958856289866c28d74f598a00557028d4c10cd6b9b46e9d417b052ea9fdcc0701f0d7228d603c7531da704c6ce1420733cc04f58fb0cc diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.46.8.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.46.8.ebuild index 24a225c5dbec..4d37d49b99fd 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-3.46.8.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-3.46.8.ebuild @@ -14,7 +14,7 @@ IUSE="debug +gnome-shell +nautilus vanilla" # Upstream is hostile and refuses to upload tarballs. SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"; -SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.46.2-cntr-ntfy-autottl-ts.patch.xz )" +SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.46.8-cntr-ntfy-autottl-ts.patch.xz )" KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" @@ -59,7 +59,7 @@ src_prepare() { # Automatic title updating based on currently running foreground process # https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch # Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE - eapply "${WORKDIR}"/${PN}-3.46.2-cntr-ntfy-autottl-ts.patch + eapply "${WORKDIR}"/${PN}-3.46.8-cntr-ntfy-autottl-ts.patch fi default } diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.48.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.48.0.ebuild index 019dd85de9ea..516da6bc615f 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-3.48.0.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-3.48.0.ebuild @@ -14,7 +14,7 @@ IUSE="debug +gnome-shell +nautilus vanilla" # Upstream is hostile and refuses to upload tarballs. SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"; -SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.46.2-cntr-ntfy-autottl-ts.patch.xz )" +SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.48.0-cntr-ntfy-autottl-ts.patch.xz )" KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" @@ -59,7 +59,7 @@ src_prepare() { # Automatic title updating based on currently running foreground process # https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch # Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE - eapply "${WORKDIR}"/${PN}-3.46.2-cntr-ntfy-autottl-ts.patch + eapply "${WORKDIR}"/${PN}-3.48.0-cntr-ntfy-autottl-ts.patch fi default }
