commit: 70e5d00844d9298c799a5c624420f61b7e8b87eb
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 15:43:44 2021 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun May 30 15:43:44 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=70e5d008
x11-libs/vte: sync with ::gentoo stable
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
x11-libs/vte/Manifest | 6 +-
.../files/vte-0.54.2-musl-remove-W_EXITCODE.patch | 23 ------
...python-explicitly-to-honor-downstream-pyt.patch | 48 +++++++++++++
x11-libs/vte/vte-0.60.3.ebuild | 82 ----------------------
.../vte/{vte-0.62.3.ebuild => vte-0.64.1.ebuild} | 17 +++--
5 files changed, 63 insertions(+), 113 deletions(-)
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index e0b2e27..15fc69b 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,4 +1,2 @@
-DIST vte-0.60.3-command-notify.patch.xz 6108 BLAKE2B
1f96788c097b003a3f9041529a0ff8ad083fe60597920632450e65ce13ad7181cb3bd4f2713ee19ab7d15154e3546720cdd0a72fabb3710ea7149c63cb159a1f
SHA512
070d17fa2dfeed5ccb5ad67687bfb65a6a9dd79db300bb6e00f7d35b8ab3563c331e5f48bbecc32f8037475db319fb71f35e72108f260b6446fd2dd8e1a2897e
-DIST vte-0.60.3.tar.xz 535504 BLAKE2B
c5556fdb91d876aa681d2a9466fa4f4c0ee6be630d076949fbd01878baffdf319e50ec75575729c49c09484914d9ee103d4d491861aedb678b0e336cd4ddcc2e
SHA512
3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18
-DIST vte-0.62.1-command-notify.patch.xz 4844 BLAKE2B
22301fdc5f1969beb2ad9b316fea8972f696f0e54e1a24d5eceedec71162afc2991b7963a71ce8925a94f6c40e5303d3db760b872d0eebbdc6d05b22d3c59ecc
SHA512
491e241b0f5aae50e59d25751e95579d40c47e7e4c7f2b279522347f7f2f7f00c92bdf5fa4a651e4146bcfa9439f03b6311b4061fb20c5679c09b97a4924dcf1
-DIST vte-0.62.3.tar.xz 447152 BLAKE2B
2c55430490af577cdbad8bbcbb53902ccc4ab8d9643d5e8b3279e96b4285347e652e761644c957961732eeb50d12e33fa3d3c735be9899ad14c1e2f35377f2a7
SHA512
0475e2813b305bf1b5d48ece5959f2feb10e89b589fa3b75032ae466fd5254bf5c2fc6085dc296d65c5df84790a38892534ff401109843bf964ae62a8c540a81
+DIST vte-0.64.1-command-notify.patch.xz 4880 BLAKE2B
d6ff5f4acac161980c8c18245e65795c7f0ea3d0819748894b055306ecd731d698cac578eff2750795a9180a9b17d79f220e814083012d5a04f4f351ff2a0e36
SHA512
174397aeca00399b138286fd4cc88941add041a1f2596fd42222d44c886c2e35b2a33041b58a102ee3acbcddc0cc40fcfde39d72ec46b640ee1db22d8ae684c4
+DIST vte-0.64.1.tar.bz2 486720 BLAKE2B
bd8fb1f471a43aadf015cce8ae38c646521ca66e37652b72f7e94cec15a2a0a844d67116e9123ede44ba1b6ee569d1ecd0ff5e83067f6231802f5a77a798e446
SHA512
38bbbb4ed3d86740091c9ddee83f97bf5cb5c69c48e8a78592dd46e8f9334859a6c523e7b16dce110de71cd4a9a3b8b99a11816b61eae6e251dfc20cdbee6716
diff --git a/x11-libs/vte/files/vte-0.54.2-musl-remove-W_EXITCODE.patch
b/x11-libs/vte/files/vte-0.54.2-musl-remove-W_EXITCODE.patch
deleted file mode 100644
index dfbc366..0000000
--- a/x11-libs/vte/files/vte-0.54.2-musl-remove-W_EXITCODE.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Expanded non-standard W_EXITCODE macro for Musl compatibility
-
-diff -Naur vte-0.54.2.orig/src/widget.cc vte-0.54.2/src/widget.cc
---- vte-0.54.2.orig/src/widget.cc 2018-09-28 10:06:12.000000000 +0200
-+++ vte-0.54.2/src/widget.cc 2018-11-06 15:04:30.275949689 +0100
-@@ -20,8 +20,6 @@
-
- #include "widget.hh"
-
--#include <sys/wait.h> // for W_EXITCODE
--
- #include <new>
- #include <string>
-
-@@ -126,7 +124,7 @@
- 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);
- }
- }
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
new file mode 100644
index 0000000..79171d2
--- /dev/null
+++
b/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
@@ -0,0 +1,48 @@
+https://gitlab.gnome.org/GNOME/vte/-/issues/350
+
+From d459d32126119c8d78f8239b8b857a255e6005d7 Mon Sep 17 00:00:00 2001
+From: Matt Turner <matts...@gmail.com>
+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/vte-0.60.3.ebuild b/x11-libs/vte/vte-0.60.3.ebuild
deleted file mode 100644
index 9605876..0000000
--- a/x11-libs/vte/vte-0.60.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.32"
-
-inherit gnome.org meson 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 )"
-
-SRC_URI="${SRC_URI} !vanilla? (
https://dev.gentoo.org/~leio/distfiles/${PN}-0.60.3-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="
- 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) )
-"
-
-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.60.3-command-notify.patch
- fi
-
- use elibc_musl && eapply
"${FILESDIR}/${PN}-0.54.2-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
- $(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.62.3.ebuild b/x11-libs/vte/vte-0.64.1.ebuild
similarity index 80%
rename from x11-libs/vte/vte-0.62.3.ebuild
rename to x11-libs/vte/vte-0.64.1.ebuild
index e263de4..cd0ca0f 100644
--- a/x11-libs/vte/vte-0.62.3.ebuild
+++ b/x11-libs/vte/vte-0.64.1.ebuild
@@ -2,10 +2,11 @@
# 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 vala xdg
+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";
@@ -13,10 +14,12 @@ 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"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
REQUIRED_USE="vala? ( introspection )"
-SRC_URI="${SRC_URI} !vanilla? (
https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.62.1-command-notify.patch.xz
)"
+# 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?]
@@ -33,6 +36,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
+ ${PYTHON_DEPS}
dev-libs/libxml2:2
dev-util/glib-utils
gtk-doc? ( >=dev-util/gtk-doc-1.13
@@ -43,11 +47,15 @@ BDEPEND="
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.62.1-command-notify.patch
+ eapply "${WORKDIR}"/${PN}-0.64.1-command-notify.patch
fi
use elibc_musl && eapply
"${FILESDIR}/${PN}-0.62.3-musl-remove-W_EXITCODE.patch"
@@ -66,6 +74,7 @@ src_configure() {
$(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
