Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/vte/, x11-libs/vte/files/
Date: Sat, 11 Jan 2020 20:11:53
Message-Id: 1578773496.3fdfbfc38675987b589e833f6a10c2c98a20a4b3.leio@gentoo
1 commit: 3fdfbfc38675987b589e833f6a10c2c98a20a4b3
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 11 20:06:53 2020 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 11 20:11:36 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fdfbfc3
7
8 x11-libs/vte: remove old
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 x11-libs/vte/Manifest | 2 -
14 x11-libs/vte/files/0.54.4-vala-0.44-compat.patch | 29 --------
15 x11-libs/vte/vte-0.48.4.ebuild | 93 ------------------------
16 3 files changed, 124 deletions(-)
17
18 diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
19 index 5d2be72556d..36ce84d3473 100644
20 --- a/x11-libs/vte/Manifest
21 +++ b/x11-libs/vte/Manifest
22 @@ -1,5 +1,3 @@
23 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
24 -DIST vte-0.48.4-command-notify.patch.xz 5500 BLAKE2B 88b655403d2bef034604a283b173fece305af35f51b20f9d4811b33265b5a6eb83441e0b978539de501d118a8431c4a9a9a69a111a03c45adc87763b15b09fd2 SHA512 b8ba202aedb5d821962a7cdc89e6ef8ac8a3480dd7681bf8ce708ce511598f3335ba153750d40cb06e9a2c5bab5888b3daef9096458c2889d94028feaa394575
25 -DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b27109724fb318d28200220f1514fb23e4cdc90263a756914b5db442c947578c8854a535cb960a06f7bc03a77 SHA512 4b75bd881e58b5043bc44e391ef3a826a2c25d0f1bb5ffb890367e11a60b1bcbce091575ede6972a89ae043b39c51897f91fca1faf6872664d602e503d8020fc
26 DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
27 DIST vte-0.56.4.tar.xz 1100952 BLAKE2B 3c3ec69f4078bdb07a4501df4aeb31aaeb7f9fa5a4631152d486fbb2c950362612cd9dff4abe25b93da6c712a37a20ccbf050ad33d96ec7b997bb1409189f60b SHA512 5a6c79b30f07c1f5848ef59028864d893cc605b9ad8f49ae819958aaed962d2ff96baad379f126381b8bf00015003c5a6dc28c792e4e050ba35090338bd7dabb
28
29 diff --git a/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch b/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch
30 deleted file mode 100644
31 index 5da32bea838..00000000000
32 --- a/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch
33 +++ /dev/null
34 @@ -1,29 +0,0 @@
35 -From 53690d5cee51bdb7c3f7680d3c22b316b1086f2c Mon Sep 17 00:00:00 2001
36 -From: Rico Tzschichholz <ricotz@××××××.com>
37 -Date: Sat, 1 Dec 2018 19:04:59 +0100
38 -Subject: [PATCH] vala: Fix build with vala 0.43+ git master due to empty
39 - struct definition
40 -
41 -This should get a proper refactoring as the FIXME suggests.
42 -
43 -See https://gitlab.gnome.org/GNOME/vte/issues/76
44 ----
45 - bindings/vala/app.vala | 2 ++
46 - 1 file changed, 2 insertions(+)
47 -
48 -diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
49 -index 8663d63c..a534e76b 100644
50 ---- a/bindings/vala/app.vala
51 -+++ b/bindings/vala/app.vala
52 -@@ -819,6 +819,8 @@ class App : Gtk.Application
53 -
54 - public struct Options
55 - {
56 -+ //FIXME Merge this struct into App class
57 -+ public int dummy;
58 - public static bool audible = false;
59 - public static string? command = null;
60 - private static string? cjk_ambiguous_width_string = null;
61 ---
62 -2.20.1
63 -
64
65 diff --git a/x11-libs/vte/vte-0.48.4.ebuild b/x11-libs/vte/vte-0.48.4.ebuild
66 deleted file mode 100644
67 index 5ffe7d62e34..00000000000
68 --- a/x11-libs/vte/vte-0.48.4.ebuild
69 +++ /dev/null
70 @@ -1,93 +0,0 @@
71 -# Copyright 1999-2019 Gentoo Authors
72 -# Distributed under the terms of the GNU General Public License v2
73 -
74 -EAPI="6"
75 -VALA_USE_DEPEND="vapigen"
76 -VALA_MIN_API_VERSION="0.32"
77 -
78 -inherit gnome2 vala
79 -
80 -DESCRIPTION="Library providing a virtual terminal emulator widget"
81 -HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
82 -
83 -LICENSE="LGPL-2+"
84 -SLOT="2.91"
85 -IUSE="+crypt debug glade +introspection vala vanilla"
86 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
87 -REQUIRED_USE="vala? ( introspection )"
88 -
89 -SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~eva/distfiles/${PN}/${P}-command-notify.patch.xz )"
90 -
91 -RDEPEND="
92 - >=dev-libs/glib-2.40:2
93 - >=dev-libs/libpcre2-10.21
94 - >=x11-libs/gtk+-3.16:3[introspection?]
95 - >=x11-libs/pango-1.22.0
96 -
97 - sys-libs/ncurses:0=
98 - sys-libs/zlib
99 -
100 - crypt? ( >=net-libs/gnutls-3.2.7:0= )
101 - glade? ( >=dev-util/glade-3.9:3.10 )
102 - introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
103 -"
104 -DEPEND="${RDEPEND}
105 - dev-util/gperf
106 - dev-libs/libxml2
107 - >=dev-util/gtk-doc-am-1.13
108 - >=dev-util/intltool-0.35
109 - sys-devel/gettext
110 - virtual/pkgconfig
111 -
112 - vala? ( $(vala_depend) )
113 -"
114 -RDEPEND="${RDEPEND}
115 - !x11-libs/vte:2.90[glade]
116 -"
117 -
118 -src_prepare() {
119 - if ! use vanilla; then
120 - # First half of http://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/vte291-command-notify-scroll-speed.patch
121 - # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
122 - eapply "${WORKDIR}"/${P}-command-notify.patch
123 - fi
124 -
125 - # Fix bindings test compilation with vala:0.44 and newer - https://gitlab.gnome.org/GNOME/vte/issues/76
126 - eapply "${FILESDIR}"/0.54.4-vala-0.44-compat.patch
127 -
128 - use vala && vala_src_prepare
129 -
130 - # build fails because of -Werror with gcc-5.x
131 - sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed"
132 -
133 - gnome2_src_prepare
134 -}
135 -
136 -src_configure() {
137 - local myconf=""
138 -
139 - if [[ ${CHOST} == *-interix* ]]; then
140 - myconf="${myconf} --disable-Bsymbolic"
141 -
142 - # interix stropts.h is empty...
143 - export ac_cv_header_stropts_h=no
144 - fi
145 -
146 - # Python bindings are via gobject-introspection
147 - # Ex: from gi.repository import Vte
148 - gnome2_src_configure \
149 - --disable-test-application \
150 - --disable-static \
151 - --with-gtk=3.0 \
152 - $(use_enable debug) \
153 - $(use_enable glade glade-catalogue) \
154 - $(use_with crypt gnutls) \
155 - $(use_enable introspection) \
156 - $(use_enable vala) \
157 - ${myconf}
158 -}
159 -
160 -src_install() {
161 - gnome2_src_install
162 - mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
163 -}