| 1 |
commit: c5d38fa48fe5cc72fe10113a9529951060f90144 |
| 2 |
Author: callmetango <callmetango <AT> users <DOT> noreply <DOT> github <DOT> com> |
| 3 |
AuthorDate: Tue Nov 6 14:21:50 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 4 15:54:55 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c5d38fa4 |
| 7 |
|
| 8 |
x11-libs/vte: version bump to 0.54.2 |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
x11-libs/vte/Manifest | 4 +- |
| 13 |
.../files/vte-0.54.2-musl-remove-W_EXITCODE.patch | 23 ++++++ |
| 14 |
x11-libs/vte/metadata.xml | 3 + |
| 15 |
x11-libs/vte/vte-0.54.2.ebuild | 91 ++++++++++++++++++++++ |
| 16 |
4 files changed, 120 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest |
| 19 |
index 2562fed..546a2da 100644 |
| 20 |
--- a/x11-libs/vte/Manifest |
| 21 |
+++ b/x11-libs/vte/Manifest |
| 22 |
@@ -1 +1,3 @@ |
| 23 |
-DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c |
| 24 |
+DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 |
| 25 |
+DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c |
| 26 |
+DIST vte-0.54.2.tar.xz 1087628 BLAKE2B 9e613ff514beef395f88677ebb25d278df3107b90af07f5d7cbebc44f93d5a6784d65b56cca2c3c020bbf20b0f406a933b97678004bbb586e1485f4aeda08aa9 SHA512 214ec69110d6ad6caa9bc41fb741874bfcf27f20f34d3ae745b13903c574f9c854f7e0dadbae3dbc8ce04c5a6eb818a433c50569c1ef802501a9a078385f23fc |
| 27 |
|
| 28 |
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 |
| 29 |
new file mode 100644 |
| 30 |
index 0000000..dfbc366 |
| 31 |
--- /dev/null |
| 32 |
+++ b/x11-libs/vte/files/vte-0.54.2-musl-remove-W_EXITCODE.patch |
| 33 |
@@ -0,0 +1,23 @@ |
| 34 |
+Expanded non-standard W_EXITCODE macro for Musl compatibility |
| 35 |
+ |
| 36 |
+diff -Naur vte-0.54.2.orig/src/widget.cc vte-0.54.2/src/widget.cc |
| 37 |
+--- vte-0.54.2.orig/src/widget.cc 2018-09-28 10:06:12.000000000 +0200 |
| 38 |
++++ vte-0.54.2/src/widget.cc 2018-11-06 15:04:30.275949689 +0100 |
| 39 |
+@@ -20,8 +20,6 @@ |
| 40 |
+ |
| 41 |
+ #include "widget.hh" |
| 42 |
+ |
| 43 |
+-#include <sys/wait.h> // for W_EXITCODE |
| 44 |
+- |
| 45 |
+ #include <new> |
| 46 |
+ #include <string> |
| 47 |
+ |
| 48 |
+@@ -126,7 +124,7 @@ |
| 49 |
+ Widget::dispose() noexcept |
| 50 |
+ { |
| 51 |
+ if (m_terminal->terminate_child()) { |
| 52 |
+- int status = W_EXITCODE(0, SIGKILL); |
| 53 |
++ int status = (0) << 8 | (SIGKILL); // W_EXITCODE(ret, sig) |
| 54 |
+ emit_child_exited(status); |
| 55 |
+ } |
| 56 |
+ } |
| 57 |
|
| 58 |
diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml |
| 59 |
index 996e7ca..9889b0b 100644 |
| 60 |
--- a/x11-libs/vte/metadata.xml |
| 61 |
+++ b/x11-libs/vte/metadata.xml |
| 62 |
@@ -5,4 +5,7 @@ |
| 63 |
<email>gnome@g.o</email> |
| 64 |
<name>Gentoo GNOME Desktop</name> |
| 65 |
</maintainer> |
| 66 |
+ <use> |
| 67 |
+ <flag name="glade">Installs catalog files for <pkg>dev-util/glade</pkg></flag> |
| 68 |
+ </use> |
| 69 |
</pkgmetadata> |
| 70 |
|
| 71 |
diff --git a/x11-libs/vte/vte-0.54.2.ebuild b/x11-libs/vte/vte-0.54.2.ebuild |
| 72 |
new file mode 100644 |
| 73 |
index 0000000..5a85452 |
| 74 |
--- /dev/null |
| 75 |
+++ b/x11-libs/vte/vte-0.54.2.ebuild |
| 76 |
@@ -0,0 +1,91 @@ |
| 77 |
+# Copyright 1999-2018 Gentoo Authors |
| 78 |
+# Distributed under the terms of the GNU General Public License v2 |
| 79 |
+ |
| 80 |
+EAPI="6" |
| 81 |
+VALA_USE_DEPEND="vapigen" |
| 82 |
+VALA_MIN_API_VERSION="0.32" |
| 83 |
+ |
| 84 |
+inherit autotools gnome2 vala |
| 85 |
+ |
| 86 |
+DESCRIPTION="Library providing a virtual terminal emulator widget" |
| 87 |
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE" |
| 88 |
+ |
| 89 |
+LICENSE="LGPL-2+" |
| 90 |
+SLOT="2.91" |
| 91 |
+IUSE="+crypt debug glade +introspection vala vanilla" |
| 92 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
| 93 |
+REQUIRED_USE="vala? ( introspection )" |
| 94 |
+ |
| 95 |
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )" |
| 96 |
+ |
| 97 |
+RDEPEND=" |
| 98 |
+ >=dev-libs/glib-2.40:2 |
| 99 |
+ >=dev-libs/libpcre2-10.21 |
| 100 |
+ >=x11-libs/gtk+-3.16:3[introspection?] |
| 101 |
+ >=x11-libs/pango-1.22.0 |
| 102 |
+ |
| 103 |
+ sys-libs/ncurses:0= |
| 104 |
+ sys-libs/zlib |
| 105 |
+ |
| 106 |
+ crypt? ( >=net-libs/gnutls-3.2.7:0= ) |
| 107 |
+ glade? ( >=dev-util/glade-3.9:3.10 ) |
| 108 |
+ introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) |
| 109 |
+" |
| 110 |
+DEPEND="${RDEPEND} |
| 111 |
+ dev-libs/libxml2:2 |
| 112 |
+ dev-util/glib-utils |
| 113 |
+ >=dev-util/gtk-doc-am-1.13 |
| 114 |
+ >=dev-util/intltool-0.35 |
| 115 |
+ sys-devel/gettext |
| 116 |
+ virtual/pkgconfig |
| 117 |
+ |
| 118 |
+ vala? ( $(vala_depend) ) |
| 119 |
+" |
| 120 |
+RDEPEND="${RDEPEND} |
| 121 |
+ !x11-libs/vte:2.90[glade] |
| 122 |
+" |
| 123 |
+ |
| 124 |
+src_prepare() { |
| 125 |
+ if ! use vanilla; then |
| 126 |
+ # First half of http://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/vte291-command-notify-scroll-speed.patch |
| 127 |
+ # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere |
| 128 |
+ eapply "${WORKDIR}"/${PN}-0.54.1-command-notify.patch |
| 129 |
+ fi |
| 130 |
+ |
| 131 |
+ eapply "${FILESDIR}/${P}-musl-remove-W_EXITCODE.patch" |
| 132 |
+ eautoreconf |
| 133 |
+ |
| 134 |
+ use vala && vala_src_prepare |
| 135 |
+ |
| 136 |
+ # build fails because of -Werror with gcc-5.x |
| 137 |
+ sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed" |
| 138 |
+ |
| 139 |
+ gnome2_src_prepare |
| 140 |
+} |
| 141 |
+ |
| 142 |
+src_configure() { |
| 143 |
+ local myconf="" |
| 144 |
+ |
| 145 |
+ if [[ ${CHOST} == *-interix* ]]; then |
| 146 |
+ myconf="${myconf} --disable-Bsymbolic" |
| 147 |
+ |
| 148 |
+ # interix stropts.h is empty... |
| 149 |
+ export ac_cv_header_stropts_h=no |
| 150 |
+ fi |
| 151 |
+ |
| 152 |
+ gnome2_src_configure \ |
| 153 |
+ --disable-static \ |
| 154 |
+ --with-gtk=3.0 \ |
| 155 |
+ --with-iconv \ |
| 156 |
+ $(use_enable debug) \ |
| 157 |
+ $(use_enable glade glade-catalogue) \ |
| 158 |
+ $(use_with crypt gnutls) \ |
| 159 |
+ $(use_enable introspection) \ |
| 160 |
+ $(use_enable vala) \ |
| 161 |
+ ${myconf} |
| 162 |
+} |
| 163 |
+ |
| 164 |
+src_install() { |
| 165 |
+ gnome2_src_install |
| 166 |
+ mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die |
| 167 |
+} |
Archives