Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/gnome-terminal/files/, x11-terms/gnome-terminal/
Date: Tue, 31 May 2022 18:24:27
Message-Id: 1654021423.bb089166482ed4980b369db67a5ad8c219df7e4b.mattst88@gentoo
1 commit: bb089166482ed4980b369db67a5ad8c219df7e4b
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 31 17:49:49 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Tue May 31 18:23:43 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb089166
7
8 x11-terms/gnome-terminal: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 x11-terms/gnome-terminal/Manifest | 2 -
13 .../files/3.42.2-fix-build-with-meson-0.61.1.patch | 39 ---------
14 .../gnome-terminal/gnome-terminal-3.42.2.ebuild | 96 ----------------------
15 3 files changed, 137 deletions(-)
16
17 diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
18 index 848190518745..2199c60f8d38 100644
19 --- a/x11-terms/gnome-terminal/Manifest
20 +++ b/x11-terms/gnome-terminal/Manifest
21 @@ -1,5 +1,3 @@
22 -DIST gnome-terminal-3.42.2-cntr-ntfy-autottl-ts.patch.xz 33980 BLAKE2B e0400f960064907c84a059b2210a9299e353b280e4bbe2fb98a887f9806fc2eb5f7de9d3e6dee243f6297275479ec546d47292bb30ea02e8f4a887fafbe04e71 SHA512 4afab38bff15963e88bc756914b5c379634c68d59f0be1189d969ea0a8b7f3f6c0a077199455cc4c2eca96e5c3df06bddebdc32b786aaba3a885e21cb710f210
23 -DIST gnome-terminal-3.42.2.tar.xz 1806388 BLAKE2B 9e3068d9731689dd5dc012405384073a6ea07d59370340bcccdc3383e24f5a5424a14b5e903a01b4cca3925758f9b2f5cd7861b30658324297f817807fefbb66 SHA512 001504539adbcdac609f22ee8120455d2a2db8f4208ca2715c6bb271b5488bfdbe78deca3c997cd4d2293f2e7e51db66746af56f5ba46792542654972dbc739e
24 DIST gnome-terminal-3.44.0-cntr-ntfy-autottl-ts.patch.xz 37248 BLAKE2B b3599386e7272fc5b742c11663f09bbfafa84cc855bd13fd602d679601fbb4126f36cdb157db37db335bf9edfe7d2b85e534baf837c5817984ec17baa4cdbb6c SHA512 6422a774abfee18b2681115344f508b72ead1bb9f27b5b1596b419a9ce5a137d41e2d749b6d784170225e7f21f15c109f7eb74cc3164371d53dee7790bf99187
25 DIST gnome-terminal-3.44.0.tar.xz 1810124 BLAKE2B 041aa7400cbf0f075c37f6276d06dbffb0b87da13d8bcb9d13e62b13a1e16ae612970d1ec6462c7c257f7bcf2da222b48df1d8d28ce24b216ae3d11c76f05341 SHA512 0cf039c0aa364a9ac63d9f24d466506a919cf733f2ee8dc1c6f42459e6c742bad678f7ad7cec3721e9512b8f414dc4c4c1f29057c73e5e4a870a04d6bcd98ed6
26 DIST gnome-terminal-3.44.1.tar.xz 1813032 BLAKE2B 3e001139aa0516bd27f7215c692c048393d6ad41737b8817f212529d3c530f6417d05601f63e6265e3fb84e788322341c25784a0a26ee7434f1d4bccd31c1eea SHA512 afaa9a1b4fa86fea853a242f167d1ba3438efe4e049336bae138cb800d43c3325f624849463f16c9d4e34360916377c4edbfd2f3977212b51e35a41cca88b283
27
28 diff --git a/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch b/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch
29 deleted file mode 100644
30 index e0e9d39204f2..000000000000
31 --- a/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch
32 +++ /dev/null
33 @@ -1,39 +0,0 @@
34 -https://github.com/GNOME/gnome-terminal/commit/9a168cc23962ce9fa106dc8a40407d381a3db403
35 -https://bugs.gentoo.org/831940
36 -
37 -From: Christian Persch <chpe@×××××××××.org>
38 -Date: Fri, 14 Jan 2022 11:33:32 +0100
39 -Subject: [PATCH] build: Fix for newer meson
40 ---- a/data/meson.build
41 -+++ b/data/meson.build
42 -@@ -18,7 +18,6 @@
43 - metainfodir = gt_datadir / 'metainfo'
44 -
45 - i18n.merge_file(
46 -- gt_dns_name + '.metainfo.xml',
47 - input: gt_dns_name + '.metainfo.xml.in',
48 - output: '@BASENAME@',
49 - po_dir: po_dir,
50 -@@ -27,7 +26,6 @@ i18n.merge_file(
51 - )
52 -
53 - i18n.merge_file(
54 -- gt_dns_name + '.Nautilus.metainfo.xml',
55 - input: gt_dns_name + '.Nautilus.metainfo.xml.in',
56 - output: '@BASENAME@',
57 - po_dir: po_dir,
58 -@@ -40,7 +38,6 @@ i18n.merge_file(
59 - desktopdatadir = gt_datadir / 'applications'
60 -
61 - i18n.merge_file(
62 -- gt_dns_name + '.desktop',
63 - input: gt_dns_name + '.desktop.in',
64 - output: '@BASENAME@',
65 - type: 'desktop',
66 -@@ -57,4 +54,4 @@ meson.add_install_script(
67 -
68 - # Subdirs
69 -
70 --subdir('icons')
71 -\ No newline at end of file
72 -+subdir('icons')
73
74 diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild
75 deleted file mode 100644
76 index 2dc8e8704803..000000000000
77 --- a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild
78 +++ /dev/null
79 @@ -1,96 +0,0 @@
80 -# Copyright 1999-2022 Gentoo Authors
81 -# Distributed under the terms of the GNU General Public License v2
82 -
83 -EAPI=7
84 -
85 -inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
86 -
87 -DESCRIPTION="A terminal emulator for GNOME"
88 -HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal"
89 -
90 -LICENSE="GPL-3+"
91 -SLOT="0"
92 -IUSE="debug +gnome-shell +nautilus vanilla"
93 -SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.42.2-cntr-ntfy-autottl-ts.patch.xz )"
94 -
95 -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
96 -
97 -# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
98 -RDEPEND="
99 - >=dev-libs/glib-2.52:2
100 - >=x11-libs/gtk+-3.22.27:3
101 - >=x11-libs/vte-0.64.0:2.91[!vanilla?]
102 - >=dev-libs/libpcre2-10
103 - >=gnome-base/dconf-0.14
104 - >=gnome-base/gsettings-desktop-schemas-0.1.0
105 - sys-apps/util-linux
106 - gnome-shell? ( gnome-base/gnome-shell )
107 - nautilus? ( >=gnome-base/nautilus-3.28.0 )
108 -"
109 -DEPEND="${RDEPEND}"
110 -# itstool required for help/* with non-en LINGUAS, see bug #549358
111 -# xmllint required for glib-compile-resources, see bug #549304
112 -BDEPEND="
113 - dev-libs/libxml2:2
114 - dev-libs/libxslt
115 - dev-util/gdbus-codegen
116 - dev-util/glib-utils
117 - dev-util/itstool
118 - >=sys-devel/gettext-0.19.8
119 - virtual/pkgconfig
120 -"
121 -
122 -PATCHES=(
123 - "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
124 -)
125 -
126 -DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
127 - notifications of long-running commands finishing, you will need
128 - to add the following line to your ~/.bashrc:\n
129 - . /etc/profile.d/vte-2.91.sh"
130 -
131 -src_prepare() {
132 - if ! use vanilla; then
133 - # https://bugzilla.gnome.org/show_bug.cgi?id=695371
134 - # Fedora patches:
135 - # Restore transparency support (with compositing WMs only)
136 - # OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
137 - # Restore "Set title" support
138 - # Automatic title updating based on currently running foreground process
139 - # https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
140 - # Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE
141 - eapply "${WORKDIR}"/${PN}-3.42.2-cntr-ntfy-autottl-ts.patch
142 - fi
143 - default
144 -}
145 -
146 -src_configure() {
147 - local emesonargs=(
148 - $(meson_use debug dbg)
149 - -Ddocs=false
150 - $(meson_use nautilus nautilus_extension)
151 - $(meson_use gnome-shell search_provider)
152 - )
153 - meson_src_configure
154 -}
155 -
156 -src_install() {
157 - meson_src_install
158 - if ! use vanilla; then
159 - # Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal"
160 - insinto /usr/share/glib-2.0/schemas
161 - newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override
162 - fi
163 - readme.gentoo_create_doc
164 -}
165 -
166 -pkg_postinst() {
167 - xdg_pkg_postinst
168 - gnome2_schemas_update
169 - readme.gentoo_print_elog
170 -}
171 -
172 -pkg_postrm() {
173 - xdg_pkg_postrm
174 - gnome2_schemas_update
175 -}