commit: 4cefb8f49efdfa9e0445e14d3d9950f3d9f944a7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Apr 25 17:40:30 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Apr 25 17:40:30 2022 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=4cefb8f4
x11-libs/vte: treeclean Bug: https://bugs.gentoo.org/840583 Signed-off-by: Sam James <sam <AT> gentoo.org> x11-libs/vte/Manifest | 4 - .../files/vte-0.62.3-musl-remove-W_EXITCODE.patch | 34 -------- ...python-explicitly-to-honor-downstream-pyt.patch | 48 ----------- x11-libs/vte/metadata.xml | 8 -- x11-libs/vte/vte-0.64.2.ebuild | 91 --------------------- x11-libs/vte/vte-0.66.2.ebuild | 92 ---------------------- 6 files changed, 277 deletions(-) diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest deleted file mode 100644 index 82d36fbc..00000000 --- a/x11-libs/vte/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST vte-0.64.1-command-notify.patch.xz 4880 BLAKE2B d6ff5f4acac161980c8c18245e65795c7f0ea3d0819748894b055306ecd731d698cac578eff2750795a9180a9b17d79f220e814083012d5a04f4f351ff2a0e36 SHA512 174397aeca00399b138286fd4cc88941add041a1f2596fd42222d44c886c2e35b2a33041b58a102ee3acbcddc0cc40fcfde39d72ec46b640ee1db22d8ae684c4 -DIST vte-0.64.2.tar.bz2 486837 BLAKE2B 3e127d61e4018607ca2df170108aef65b224a48df4d57545c98cbdb9753cbe7b9821e91a5bccd09d8c39af95d747a2ff01c69320e9245f5a82e7887b62c32c97 SHA512 6cbc1ee25a0ef2b00bcf26c07042eccc14fdea323e4445123db9fad05bf2e799579d723f6147c08712aec9b94e17003ce8f9e6ebe65278fdb3832cf77cba5be5 -DIST vte-0.66.2-command-notify.patch.xz 9672 BLAKE2B 8153a250f571f491845041627029065029bd32ab63c127aacc0852f42abee0834c716d63248120a49011857901d775b75fc0c31a513cfb113563e8ffb599e478 SHA512 d491f8332fbd21e8dfe225636ca035339ab1da3bd7dc74436cdd2f3de3c5f24f609f9825c4eb0b816c9f60862da62b97f36381c5cc5af0203b3698d56fc77d3e -DIST vte-0.66.2.tar.bz2 503503 BLAKE2B 174a0d9bfdaf2318255e62041ed94aa53f8fc110ed55f3e7b24baa70dd01a4851306ac47cc3f1d6699341c9ab41f85aee57c460b9f96bfd14618f0f40e4bd657 SHA512 6e9e2cc03b72c2d04aa3d7633dcf86649dcef39fdfecbe7a0c4b063eaccdb2ea83207f592edf348fad5a36f091d9261cc46fd0a4e9e5db6006fcecb0d01a6ccc diff --git a/x11-libs/vte/files/vte-0.62.3-musl-remove-W_EXITCODE.patch b/x11-libs/vte/files/vte-0.62.3-musl-remove-W_EXITCODE.patch deleted file mode 100644 index 49633bed..00000000 --- a/x11-libs/vte/files/vte-0.62.3-musl-remove-W_EXITCODE.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1c1de9e9119cf1e0ef45a594ca9bbf306d2209cb Mon Sep 17 00:00:00 2001 -From: -Date: Fri, 12 Mar 2021 08:41:13 -0600 -Subject: [PATCH] Expanded non-standard W_EXITCODE macro for Musl compatibility - ---- - src/widget.cc | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/widget.cc b/src/widget.cc -index 44a2271..109ff5f 100644 ---- a/src/widget.cc -+++ b/src/widget.cc -@@ -20,8 +20,6 @@ - - #include "widget.hh" - --#include <sys/wait.h> // for W_EXITCODE -- - #include <exception> - #include <new> - #include <string> -@@ -235,7 +233,7 @@ void - Widget::dispose() noexcept - { - if (m_terminal->terminate_child()) { -- int status = W_EXITCODE(0, SIGKILL); -+ int status = (0) << 8 | (SIGKILL); // W_EXITCODE(ret, sig) - emit_child_exited(status); - } - } --- -2.26.2 - diff --git a/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch b/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch deleted file mode 100644 index 79171d29..00000000 --- a/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://gitlab.gnome.org/GNOME/vte/-/issues/350 - -From d459d32126119c8d78f8239b8b857a255e6005d7 Mon Sep 17 00:00:00 2001 -From: Matt Turner <[email protected]> -Date: Sat, 1 May 2021 08:31:45 -0400 -Subject: [PATCH] meson: Find python explicitly to honor downstream python - choice - ---- - meson.build | 1 + - src/meson.build | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/meson.build b/meson.build -index 4f5a7c57..6404802f 100644 ---- a/meson.build -+++ b/meson.build -@@ -461,6 +461,7 @@ pango_dep = dependency('pango', version: '>=' + pango_req_version) - pcre2_dep = dependency('libpcre2-8', version: '>=' + pcre2_req_version) - pthreads_dep = dependency('threads') - zlib_dep = dependency('zlib') -+python = import('python').find_installation('python3') - - if get_option('fribidi') - fribidi_dep = dependency('fribidi', version: '>=' + fribidi_req_version) -diff --git a/src/meson.build b/src/meson.build -index a1440da5..4ac6a7f2 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -60,6 +60,7 @@ modes_sources = files( - modes_sources += custom_target( - 'modes', - command: [ -+ python, - files('modes.py'), - '--destdir', '@OUTDIR@', - ], -@@ -92,6 +93,7 @@ parser_sources = files( - parser_sources += custom_target( - 'parser-seq', - command: [ -+ python, - files('parser-seq.py'), - '--destdir', '@OUTDIR@', - ], --- -2.26.3 - diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml deleted file mode 100644 index 996e7cac..00000000 --- a/x11-libs/vte/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> -</pkgmetadata> diff --git a/x11-libs/vte/vte-0.64.2.ebuild b/x11-libs/vte/vte-0.64.2.ebuild deleted file mode 100644 index cd0ca0fb..00000000 --- a/x11-libs/vte/vte-0.64.2.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -VALA_USE_DEPEND="vapigen" -VALA_MIN_API_VERSION="0.32" - -inherit gnome.org meson python-any-r1 vala xdg - -DESCRIPTION="Library providing a virtual terminal emulator widget" -HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"; - -LICENSE="LGPL-3+ GPL-3+" -SLOT="2.91" -IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla" -KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" -REQUIRED_USE="vala? ( introspection )" - -# 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.64.1-command-notify.patch.xz )" - -RDEPEND=" - >=x11-libs/gtk+-3.24.14:3[introspection?] - >=dev-libs/fribidi-1.0.0 - >=dev-libs/glib-2.52:2 - crypt? ( >=net-libs/gnutls-3.2.7:0= ) - icu? ( dev-libs/icu:= ) - >=x11-libs/pango-1.22.0 - >=dev-libs/libpcre2-10.21 - systemd? ( >=sys-apps/systemd-220:= ) - sys-libs/zlib - introspection? ( >=dev-libs/gobject-introspection-1.56:= ) - x11-libs/pango[introspection?] -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - dev-libs/libxml2:2 - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.13 - app-text/docbook-xml-dtd:4.1.2 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - - vala? ( $(vala_depend) ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch -) - -src_prepare() { - if ! use vanilla; then - # Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch - # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere - eapply "${WORKDIR}"/${PN}-0.64.1-command-notify.patch - fi - - use elibc_musl && eapply "${FILESDIR}/${PN}-0.62.3-musl-remove-W_EXITCODE.patch" - - # -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter - sed -e '/ggdb3/d' -i meson.build || die - - use vala && vala_src_prepare - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - -Da11y=true - $(meson_use debug debugg) - $(meson_use gtk-doc docs) - $(meson_use introspection gir) - -Dfribidi=true # pulled in by pango anyhow - -Dglade=true - $(meson_use crypt gnutls) - -Dgtk3=true - -Dgtk4=false - $(meson_use icu) - $(meson_use systemd _systemd) - $(meson_use vala vapi) - ) - meson_src_configure -} - -src_install() { - meson_src_install - mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die -} diff --git a/x11-libs/vte/vte-0.66.2.ebuild b/x11-libs/vte/vte-0.66.2.ebuild deleted file mode 100644 index 491fcb6b..00000000 --- a/x11-libs/vte/vte-0.66.2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) -VALA_USE_DEPEND="vapigen" -VALA_MIN_API_VERSION="0.48" - -inherit gnome.org meson python-any-r1 vala xdg - -DESCRIPTION="Library providing a virtual terminal emulator widget" -HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte"; - -# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+) -LICENSE="LGPL-3+ GPL-3+" -SLOT="2.91" -IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla" -KEYWORDS="amd64 arm arm64 ~mips ~ppc ~ppc64 x86" -REQUIRED_USE="vala? ( introspection )" - -# 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.66.2-command-notify.patch.xz )" - -RDEPEND=" - >=x11-libs/gtk+-3.24.22:3[introspection?] - >=dev-libs/fribidi-1.0.0 - >=dev-libs/glib-2.52:2 - crypt? ( >=net-libs/gnutls-3.2.7:0= ) - icu? ( dev-libs/icu:= ) - >=x11-libs/pango-1.22.0 - >=dev-libs/libpcre2-10.21 - systemd? ( >=sys-apps/systemd-220:= ) - sys-libs/zlib - introspection? ( >=dev-libs/gobject-introspection-1.56:= ) - x11-libs/pango[introspection?] -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - dev-libs/libxml2:2 - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.13 - app-text/docbook-xml-dtd:4.1.2 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - - vala? ( $(vala_depend) ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch -) - -src_prepare() { - if ! use vanilla; then - # Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch - # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere - eapply "${WORKDIR}"/${PN}-0.66.2-command-notify.patch - fi - - # -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter - sed -e '/ggdb3/d' -i meson.build || die - - use elibc_musl && eapply "${FILESDIR}/${PN}-0.62.3-musl-remove-W_EXITCODE.patch" - - use vala && vala_src_prepare - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - -Da11y=true - $(meson_use debug debugg) - $(meson_use gtk-doc docs) - $(meson_use introspection gir) - -Dfribidi=true # pulled in by pango anyhow - -Dglade=true - $(meson_use crypt gnutls) - -Dgtk3=true - -Dgtk4=false - $(meson_use icu) - $(meson_use systemd _systemd) - $(meson_use vala vapi) - ) - meson_src_configure -} - -src_install() { - meson_src_install - mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die -}
