public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/musl:master commit in: x11-libs/vte/, x11-libs/vte/files/
@ 2015-07-18 23:07 Anthony G. Basile
  0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2015-07-18 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     5b4d7a8b9b2e2255616109717b139d43b52ba4bb
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 23:09:22 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 23:09:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=5b4d7a8b

x11-libs/vte: fix 0.28.2.  Bug #554416.

 x11-libs/vte/Manifest                              |   8 ++
 .../vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch      |  10 ++
 x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch |  13 +++
 x11-libs/vte/files/vte-0.28.2-interix.patch        |  51 +++++++++
 .../vte/files/vte-0.28.2-limit-arguments.patch     |  40 +++++++
 x11-libs/vte/files/vte-0.30.1-alt-meta.patch       |  74 ++++++++++++
 x11-libs/vte/metadata.xml                          |   8 ++
 x11-libs/vte/vte-0.28.2-r207.ebuild                | 126 +++++++++++++++++++++
 8 files changed, 330 insertions(+)

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
new file mode 100644
index 0000000..141b71f
--- /dev/null
+++ b/x11-libs/vte/Manifest
@@ -0,0 +1,8 @@
+AUX vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch 161 SHA256 bb8bfcb6d88f40dba0025e9ec95f579219db7e80654371a1c926fa39a38134b2 SHA512 bf8174189fe842d171c04633ce1f8b920f3a515108db48bfe1fff7e537960a88f7439a55b283b6ade6ebfe78ab8ff2473f3be2d062dc00aa74b93a13624b4d3c WHIRLPOOL 1df51a3ff3bd9e9bd76ddbf856236cb3872659c4a4771473409668a6214dd5ebe51d8bed77829b7075736ebf06aaccb6fc3863f260f630bd666af0fce3fa1b83
+AUX vte-0.28.2-add_HAVE_ROUND.patch 430 SHA256 0af936b79e7ecbee4fa14a7dd8853f261aeac82625c87aedeee32f260526e440 SHA512 ffef2c472c955bbab37fc068e842fd7c6ef8a98271c3a71cb26855ea0647e2d356c59e614ae13f66ccd884af269e24f0242ebbf5c94702e43839f9f568a2af5c WHIRLPOOL 73c8b43ab70ce8af6d6d32f72d52b0e8d403fd3fcf0afbbf7476ce17738551142121d54438e9f85bb42e7769fffc5637eacc5783c0506ad3cbde752afe5e497b
+AUX vte-0.28.2-interix.patch 1566 SHA256 0c3bd451d2a48dd38b375fc7d72b675bbfcbcda66f6fbcdd20eeee315727d518 SHA512 f02574f96355c6cedde05d0877d3bf50e7777d210484a80b6e95e597b0bb225f5968649e67f67d7f112f50302ae6566e4f3d8c59d7a5b65fc95601cac00868d7 WHIRLPOOL cd444a499735517fd523e358fa0ad39f9bd8771911da18f06ddb453cdabace3cdb20e2f9aa13428efb1e6b1227ff9e10b56eb3d27616714ac873eb2a64796ae4
+AUX vte-0.28.2-limit-arguments.patch 1477 SHA256 164af2b6756329f1ceb0cac77b5e6bc47d486e1bb0b4e5d3a6fc284e4e7f0ae9 SHA512 e5639d94fd455195c354d03cab04bbb73eff98bc540c813cccf4ab5eb793f4c8ae645fcf2bd502924ed4d38412101341deaf2d28ea8aaea3530a98ffbba8256d WHIRLPOOL a0d9b077d9748c4cfe26ea03c16d9b29ed7c62e994639ae6510b7b50c4cd91c5215337da9310297dbf2bd105fabe85c45453e998c0aa34445cdcdd7192307739
+AUX vte-0.30.1-alt-meta.patch 2490 SHA256 31a46fee8fe59bd1d6df54bc502b608fe80da57bf3786e2dc6e9856a4e793ed6 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430 WHIRLPOOL bc51d9467bb13d627e7355872db5777e3d39ca07753dda9237110f8857d16bca5f8bc4334f9d97df54a2fcbc9234f123247ec8f40508e8120f00ffc46ff0a570
+DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c
+EBUILD vte-0.28.2-r207.ebuild 3022 SHA256 bfe8faf003e9f10f9a70b27a15e822265bf44fc375b060f7c3735a5c74fcf5a5 SHA512 0546a2af39f62a676328de3942dbc4182d406407ab34b72eeeafd29aa90c4f365e3bc5908dac9ba078d5bb8cecda5f8fbb995dceb455fb24c2d5d53b7de9e4d0 WHIRLPOOL 3905df734234be357499767eedc473e3028d5671eff9d4c62bb7200d2da28e661729e5d2e9f24a19c2313998e7d03a3d703e4d3b6d1cb4b9abd697c7d12ff5a4
+MISC metadata.xml 250 SHA256 86cd2180b3599ddb2bef78131a9c86a37fa1ee7247aa3245e11e7ff6a239e2e0 SHA512 78b3c7ca8d3e9b51aa7901579627ec33ab3754a16b1e86b108d35b6feca57d5565dcba04e5948d52284c212f5a2f6134bbe0912a2a121822ed07d004c7cdd209 WHIRLPOOL c7ad250c312d9537b3b810984fcebab430a9bb9a87c5639ede513b1523e447a98ce2509e208217afbdc3c3cdaf1a9f0a491ea27e2c09efae77cf933e26bde022

diff --git a/x11-libs/vte/files/vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch b/x11-libs/vte/files/vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch
new file mode 100644
index 0000000..3ca3983
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch
@@ -0,0 +1,10 @@
+--- vte-0.28.2.orig/src/pty.c
++++ vte-0.28.2/src/pty.c
+@@ -28,6 +28,7 @@
+  * Since: 0.26
+  */
+ 
++#define _GNU_SOURCE
+ #include <config.h>
+ 
+ #include "vtepty.h"

diff --git a/x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch b/x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch
new file mode 100644
index 0000000..a0ebd51
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch
@@ -0,0 +1,13 @@
+diff -ur a/vte-0.28.2/config.h.in b/vte-0.28.2/config.h.in
+--- a/vte-0.28.2/config.h.in	2015-07-10 20:49:18.179999269 -0200
++++ b/vte-0.28.2/config.h.in	2011-08-28 23:33:19.000000000 -0200
+@@ -82,6 +82,9 @@
+ /* Define if you have the recvmsg function. */
+ #undef HAVE_RECVMSG
+ 
++/* Define to 1 if you have the `round' function. */
++#undef HAVE_ROUND
++
+ /* Define to 1 if you have the `setpgid' function. */
+ #undef HAVE_SETPGID
+ 

diff --git a/x11-libs/vte/files/vte-0.28.2-interix.patch b/x11-libs/vte/files/vte-0.28.2-interix.patch
new file mode 100644
index 0000000..c54d46e
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.28.2-interix.patch
@@ -0,0 +1,51 @@
+reported upstream: https://bugzilla.gnome.org/show_bug.cgi?id=652290
+
+diff -ru vte-0.26.2.orig/configure.in vte-0.26.2/configure.in
+--- vte-0.26.2.orig/configure.in	2011-08-17 08:30:55 +0200
++++ vte-0.26.2/configure.in	2011-08-17 08:35:42 +0200
+@@ -362,7 +362,11 @@
+ 	AC_DEFINE(HAVE_RECVMSG,1,[Define if you have the recvmsg function.])
+ fi
+ AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
+-AC_CHECK_FUNCS([ceil floor])
++dnl if the first check didn't find floor, it caches the "no" value,
++dnl and doesn't recheck. this makes the below check fail always on
++dnl systems with floor in -lm. thus we unset the chached result.
++unset ac_cv_func_floor
++AC_CHECK_FUNCS([ceil floor round])
+ 
+ # Look for tgetent
+ 
+--- vte-0.26.2.orig/configure	2012-04-30 20:02:55.000000000 +0200
++++ vte-0.26.2/configure	2012-04-30 20:03:16.000000000 +0200
+@@ -13277,7 +13277,7 @@
+ 
+ fi
+ 
+-for ac_func in ceil floor
++for ac_func in ceil floor round
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+diff -ru vte-0.26.2.orig/src/vte.c vte-0.26.2/src/vte.c
+--- vte-0.26.2.orig/src/vte.c	2011-08-17 08:30:58 +0200
++++ vte-0.26.2/src/vte.c	2011-08-17 08:38:09 +0200
+@@ -63,6 +63,18 @@
+ #include <locale.h>
+ #endif
+ 
++#ifndef HAVE_ROUND
++# if defined(HAVE_CEIL) && defined(HAVE_FLOOR)
++static inline double round(double x) {
++	if(x - floor(x) < 0.5) {
++		return floor(x);
++	} else {
++		return ceil(x);
++	}
++}
++# endif
++#endif
++
+ #if GTK_CHECK_VERSION (2, 90, 7)
+ #define GDK_KEY(symbol) GDK_KEY_##symbol
+ #else

diff --git a/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch b/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch
new file mode 100644
index 0000000..fd45407
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch
@@ -0,0 +1,40 @@
+From feeee4b5832b17641e505b7083e0d299fdae318e Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Sat, 19 May 2012 17:36:09 +0000
+Subject: emulation: Limit integer arguments to 65535
+
+To guard against malicious sequences containing excessively big numbers,
+limit all parsed numbers to 16 bit range. Doing this here in the parsing
+routine is a catch-all guard; this doesn't preclude enforcing
+more stringent limits in the handlers themselves.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=676090
+---
+diff --git a/src/table.c b/src/table.c
+index 140e8c8..85cf631 100644
+--- a/src/table.c
++++ b/src/table.c
+@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array,
+ 		if (G_UNLIKELY (*array == NULL)) {
+ 			*array = g_value_array_new(1);
+ 		}
+-		g_value_set_long(&value, total);
++		g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT));
+ 		g_value_array_append(*array, &value);
+ 	} while (i++ < arginfo->length);
+ 	g_value_unset(&value);
+diff --git a/src/vteseq.c b/src/vteseq.c
+index 457c06a..46def5b 100644
+--- a/src/vteseq.c
++++ b/src/vteseq.c
+@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal,
+                               GValueArray *params,
+                               VteTerminalSequenceHandler handler)
+ {
+-        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG);
++        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT);
+ }
+ 
+ static void
+--
+cgit v0.9.0.2

diff --git a/x11-libs/vte/files/vte-0.30.1-alt-meta.patch b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
new file mode 100644
index 0000000..bd364be
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
@@ -0,0 +1,74 @@
+From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 15 Nov 2011 03:06:40 -0500
+Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2
+ compatibility
+
+Also, since VTE_META_MASK is now a mask with multiple bits set, code that
+compares gdk key modifiers to VTE_META_MASK by numerical equality is no
+longer guaranteed to work. Therefore, for such comparisons a new function,
+vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits
+matching matching VTE_META_MASK are set, then all are set.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663779
+---
+ src/keymap.c |   15 +++++++++++++--
+ src/keymap.h |    2 +-
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/keymap.c b/src/keymap.c
+index 9a21669..95b4c5b 100644
+--- a/src/keymap.c
++++ b/src/keymap.c
+@@ -990,6 +990,17 @@ static const struct _vte_keymap_group {
+ 	{GDK_KEY (F35),		_vte_keymap_GDK_F35},
+ };
+ 
++/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK,
++ * despite being a compound mask, is treated as indivisible. */
++GdkModifierType
++_vte_keymap_fixup_modifiers(GdkModifierType modifiers,
++		GdkModifierType mask)
++{
++	if (modifiers & VTE_META_MASK)
++		modifiers |= VTE_META_MASK;
++	return modifiers & mask;
++}
++
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+  * a literal string or a capability name. */
+ void
+@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval,
+ 	} else {
+ 		fkey_mode = fkey_default;
+ 	}
+-	modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
++	modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
+ 
+ 	/* Search for the conditions. */
+ 	for (i = 0; entries[i].normal_length || entries[i].special[0]; i++)
+@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
+ 		return;
+ 	}
+ 
+-	switch (modifiers & significant_modifiers) {
++	switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) {
+ 	case 0:
+ 		modifier = 0;
+ 		break;
+diff --git a/src/keymap.h b/src/keymap.h
+index 243e22e..21d9b8e 100644
+--- a/src/keymap.h
++++ b/src/keymap.h
+@@ -27,7 +27,7 @@
+ 
+ G_BEGIN_DECLS
+ 
+-#define VTE_META_MASK		GDK_META_MASK
++#define VTE_META_MASK		(GDK_META_MASK | GDK_MOD1_MASK)
+ #define VTE_NUMLOCK_MASK	GDK_MOD2_MASK
+ 
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+-- 
+1.7.8.rc3
+

diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml
new file mode 100644
index 0000000..84c40c2
--- /dev/null
+++ b/x11-libs/vte/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<use>
+	<flag name='glade'>Provide integration with <pkg>dev-util/glade</pkg>.</flag>
+</use>
+</pkgmetadata>

diff --git a/x11-libs/vte/vte-0.28.2-r207.ebuild b/x11-libs/vte/vte-0.28.2-r207.ebuild
new file mode 100644
index 0000000..4d80f53
--- /dev/null
+++ b/x11-libs/vte/vte-0.28.2-r207.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.28.2-r207.ebuild,v 1.7 2015/07/17 15:43:48 ago Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2 python-r1
+
+DESCRIPTION="GNOME terminal widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="debug +introspection python"
+
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	>=x11-libs/gtk+-2.20:2[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses
+	x11-libs/libX11
+	x11-libs/libXft
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+PDEPEND="x11-libs/gnome-pty-helper"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=663779
+	epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=652290
+	epatch "${FILESDIR}"/${PN}-0.28.2-interix.patch
+
+	# Fix CVE-2012-2738, upstream bug #676090
+	epatch "${FILESDIR}"/${PN}-0.28.2-limit-arguments.patch
+
+	# Fix musl issues, bug #554416
+	epatch "${FILESDIR}"/${PN}-0.28.2-add_HAVE_ROUND.patch
+	epatch "${FILESDIR}"/${PN}-0.28.2-GNU_SOURCE-for-ptsname_r.patch
+
+	prepare_python() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+	if use python; then
+		python_foreach_impl prepare_python
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	configure_python() {
+		ECONF_SOURCE="${S}" gnome2_src_configure --enable-python
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir configure_python
+	fi
+
+	local myconf=""
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
+	# Do not disable gnome-pty-helper, bug #401389
+	gnome2_src_configure --disable-python \
+		--disable-deprecation \
+		--disable-glade-catalogue \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		--with-gtk=2.0 \
+		${myconf}
+}
+
+src_compile() {
+	gnome2_src_compile
+
+	compile_python() {
+		cd "${BUILD_DIR}"/python || die
+		ln -s "${S}"/src/libvte.la "${BUILD_DIR}"/src/ || die
+		mkdir -p "${BUILD_DIR}"/src/.libs || die
+		ln -s "${S}"/src/.libs/libvte.so "${BUILD_DIR}"/src/.libs/ || die
+		emake CPPFLAGS="${CPPFLAGS} -I${S}/src"
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir compile_python
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	install_python() {
+		cd "${BUILD_DIR}"/python || die
+		emake install DESTDIR="${D}" \
+			CPPFLAGS="${CPPFLAGS} -I${S}/src"
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir install_python
+	fi
+
+	rm -v "${ED}usr/libexec/gnome-pty-helper" || die
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-libs/vte/, x11-libs/vte/files/
@ 2016-02-27 14:38 Anthony G. Basile
  0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2016-02-27 14:38 UTC (permalink / raw
  To: gentoo-commits

commit:     7a9753172a464a6e692eb1e2be7d24a68af1d3bb
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 14:48:02 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 14:48:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=7a975317

x11-libs/vte: properly case NULL to (char *) for sentinels

 x11-libs/vte/Manifest                              |  3 +
 x11-libs/vte/files/vte-0.42.4-fix-musl-NULLs.patch | 72 ++++++++++++++++++++
 x11-libs/vte/vte-0.42.4-r99.ebuild                 | 78 ++++++++++++++++++++++
 3 files changed, 153 insertions(+)

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 141b71f..084ae9e 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -3,6 +3,9 @@ AUX vte-0.28.2-add_HAVE_ROUND.patch 430 SHA256 0af936b79e7ecbee4fa14a7dd8853f261
 AUX vte-0.28.2-interix.patch 1566 SHA256 0c3bd451d2a48dd38b375fc7d72b675bbfcbcda66f6fbcdd20eeee315727d518 SHA512 f02574f96355c6cedde05d0877d3bf50e7777d210484a80b6e95e597b0bb225f5968649e67f67d7f112f50302ae6566e4f3d8c59d7a5b65fc95601cac00868d7 WHIRLPOOL cd444a499735517fd523e358fa0ad39f9bd8771911da18f06ddb453cdabace3cdb20e2f9aa13428efb1e6b1227ff9e10b56eb3d27616714ac873eb2a64796ae4
 AUX vte-0.28.2-limit-arguments.patch 1477 SHA256 164af2b6756329f1ceb0cac77b5e6bc47d486e1bb0b4e5d3a6fc284e4e7f0ae9 SHA512 e5639d94fd455195c354d03cab04bbb73eff98bc540c813cccf4ab5eb793f4c8ae645fcf2bd502924ed4d38412101341deaf2d28ea8aaea3530a98ffbba8256d WHIRLPOOL a0d9b077d9748c4cfe26ea03c16d9b29ed7c62e994639ae6510b7b50c4cd91c5215337da9310297dbf2bd105fabe85c45453e998c0aa34445cdcdd7192307739
 AUX vte-0.30.1-alt-meta.patch 2490 SHA256 31a46fee8fe59bd1d6df54bc502b608fe80da57bf3786e2dc6e9856a4e793ed6 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430 WHIRLPOOL bc51d9467bb13d627e7355872db5777e3d39ca07753dda9237110f8857d16bca5f8bc4334f9d97df54a2fcbc9234f123247ec8f40508e8120f00ffc46ff0a570
+AUX vte-0.42.4-fix-musl-NULLs.patch 3766 SHA256 acc4d0673cae030b95d65844ae16523d21af0947469a87432790c4f6eb354571 SHA512 cbf5eb60e3cf02570389f705e119430c32e133abc30338dc5ed4022aed7c11c3e3caf70d61e714bd32621c45b72d828137089395d41d7248165b3e140c41f89c WHIRLPOOL 2c85a7f5927f2b35c83af4cb2befe60de1c605bd3549a18c8bc5a59ec9601966b53630a2e49ee6d3eefe4f3b1061c95c46059421766e85a10e4e92cd0e7fe28c
 DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c
+DIST vte-0.42.4.tar.xz 928048 SHA256 08c88bf5c0aa1dfa3711e2e83b784fb5ea82025661f30b54e93eebd5f4bce113 SHA512 871b47d976ae8faafabd2b9dd092b40b2b452fcfd7f60182db7c12ade0c265a1810e811a9a54b6a2c2061ff05f06743b90057babf300b98f391481bb02265fb5 WHIRLPOOL e3e9fbf5303770244b10259f1a07e41a7c0168debda2e81673f8fa1e19f591a4d2c643f614636e691ecaf22fc00eb8fce79d9d4a8d20c899f5a7e4ac187259db
 EBUILD vte-0.28.2-r207.ebuild 3022 SHA256 bfe8faf003e9f10f9a70b27a15e822265bf44fc375b060f7c3735a5c74fcf5a5 SHA512 0546a2af39f62a676328de3942dbc4182d406407ab34b72eeeafd29aa90c4f365e3bc5908dac9ba078d5bb8cecda5f8fbb995dceb455fb24c2d5d53b7de9e4d0 WHIRLPOOL 3905df734234be357499767eedc473e3028d5671eff9d4c62bb7200d2da28e661729e5d2e9f24a19c2313998e7d03a3d703e4d3b6d1cb4b9abd697c7d12ff5a4
+EBUILD vte-0.42.4-r99.ebuild 1820 SHA256 20e23be71bbe97a96ed5698f1f1911ac780969483470f625aa5467dc94dcdc3e SHA512 0ff4e4fdb13ec876ecf727dc23461d977ccb190633b4e28219f2fa67f14bb6fd8b9ad4e0676c3cf6ef06c58240a618d6c5afd2e8b8850037169deb0627fda3e8 WHIRLPOOL 49150d3e74a027e00346df886717cec86b319d977d2e0aee69f1e188a8288c838913bff43a033493a52c63b5c282798d0dbe953745d3d5ef1a6b46030feadd0f
 MISC metadata.xml 250 SHA256 86cd2180b3599ddb2bef78131a9c86a37fa1ee7247aa3245e11e7ff6a239e2e0 SHA512 78b3c7ca8d3e9b51aa7901579627ec33ab3754a16b1e86b108d35b6feca57d5565dcba04e5948d52284c212f5a2f6134bbe0912a2a121822ed07d004c7cdd209 WHIRLPOOL c7ad250c312d9537b3b810984fcebab430a9bb9a87c5639ede513b1523e447a98ce2509e208217afbdc3c3cdaf1a9f0a491ea27e2c09efae77cf933e26bde022

diff --git a/x11-libs/vte/files/vte-0.42.4-fix-musl-NULLs.patch b/x11-libs/vte/files/vte-0.42.4-fix-musl-NULLs.patch
new file mode 100644
index 0000000..5b9e976
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.42.4-fix-musl-NULLs.patch
@@ -0,0 +1,72 @@
+diff -Naur vte-0.42.4.orig/src/pty.cc vte-0.42.4/src/pty.cc
+--- vte-0.42.4.orig/src/pty.cc	2016-02-27 14:27:22.376000000 +0000
++++ vte-0.42.4/src/pty.cc	2016-02-27 14:27:36.496000000 +0000
+@@ -401,7 +401,7 @@
+ 	array = g_ptr_array_sized_new (g_hash_table_size (table) + 1);
+         g_hash_table_iter_init(&iter, table);
+         while (g_hash_table_iter_next(&iter, (void**) &name, (void**) &value)) {
+-                g_ptr_array_add (array, g_strconcat (name, "=", value, NULL));
++                g_ptr_array_add (array, g_strconcat (name, "=", value, (char *)NULL));
+         }
+         g_assert(g_hash_table_size(table) == array->len);
+ 	g_hash_table_destroy (table);
+diff -Naur vte-0.42.4.orig/src/vte.cc vte-0.42.4/src/vte.cc
+--- vte-0.42.4.orig/src/vte.cc	2016-02-27 14:27:22.379000000 +0000
++++ vte-0.42.4/src/vte.cc	2016-02-27 14:27:36.499000000 +0000
+@@ -4654,7 +4654,7 @@
+         vte_terminal_set_font(terminal, terminal->pvt->unscaled_font_desc);
+         vte_terminal_set_padding(terminal);
+ 
+-        gtk_widget_style_get(widget, "cursor-aspect-ratio", &aspect, NULL);
++        gtk_widget_style_get(widget, "cursor-aspect-ratio", &aspect, (char *)NULL);
+         if (aspect != terminal->pvt->cursor_aspect_ratio) {
+                 terminal->pvt->cursor_aspect_ratio = aspect;
+                 _vte_invalidate_cursor_once(terminal, FALSE);
+@@ -7475,7 +7475,7 @@
+ 
+                                 g_object_get (gtk_widget_get_settings(widget),
+                                               "gtk-enable-primary-paste",
+-                                              &do_paste, NULL);
++                                              &do_paste, (char *)NULL);
+                                 if (do_paste)
+                                         vte_terminal_paste_primary(terminal);
+ 				handled = do_paste;
+@@ -7913,7 +7913,7 @@
+ 
+ 	/* Create an owned font description. */
+         context = gtk_widget_get_style_context(&terminal->widget);
+-        gtk_style_context_get(context, GTK_STATE_FLAG_NORMAL, "font", &desc, NULL);
++        gtk_style_context_get(context, GTK_STATE_FLAG_NORMAL, "font", &desc, (char *)NULL);
+ 	pango_font_description_set_family_static (desc, "monospace");
+ 	if (font_desc != NULL) {
+ 		pango_font_description_merge (desc, font_desc, TRUE);
+@@ -8715,7 +8715,7 @@
+                      "gtk-cursor-blink", &blink,
+                      "gtk-cursor-blink-time", &blink_time,
+                      "gtk-cursor-blink-timeout", &blink_timeout,
+-                     NULL);
++                     (char *)NULL);
+ 
+         _vte_debug_print(VTE_DEBUG_MISC,
+                          "Cursor blinking settings setting: blink=%d time=%d timeout=%d\n",
+@@ -11799,7 +11799,7 @@
+         case VTE_CURSOR_BLINK_SYSTEM:
+                 g_object_get(gtk_widget_get_settings(GTK_WIDGET(terminal)),
+                                                      "gtk-cursor-blink",
+-                                                     &blink, NULL);
++                                                     &blink, (char *)NULL);
+                 break;
+         case VTE_CURSOR_BLINK_ON:
+                 blink = TRUE;
+diff -Naur vte-0.42.4.orig/src/vtedraw.cc vte-0.42.4/src/vtedraw.cc
+--- vte-0.42.4.orig/src/vtedraw.cc	2016-02-27 14:27:22.380000000 +0000
++++ vte-0.42.4/src/vtedraw.cc	2016-02-27 14:27:36.501000000 +0000
+@@ -629,7 +629,7 @@
+ {
+ 	GtkSettings *settings = gtk_settings_get_for_screen (screen);
+ 	int fontconfig_timestamp;
+-	g_object_get (settings, "gtk-fontconfig-timestamp", &fontconfig_timestamp, NULL);
++	g_object_get (settings, "gtk-fontconfig-timestamp", &fontconfig_timestamp, (char *)NULL);
+ 	return font_info_create_for_context (gdk_pango_context_get_for_screen (screen),
+ 					     desc, language, fontconfig_timestamp);
+ }

diff --git a/x11-libs/vte/vte-0.42.4-r99.ebuild b/x11-libs/vte/vte-0.42.4-r99.ebuild
new file mode 100644
index 0000000..94ee8b4
--- /dev/null
+++ b/x11-libs/vte/vte-0.42.4-r99.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 vala
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="2.91"
+IUSE="+crypt debug glade +introspection vala"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=x11-libs/gtk+-3.8:3[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXft
+
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	crypt?  ( >=net-libs/gnutls-3.2.7 )
+"
+RDEPEND="${RDEPEND}
+	!x11-libs/vte:2.90[glade]
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-musl-NULLs.patch
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
+	# Python bindings are via gobject-introspection
+	# Ex: from gi.repository import Vte
+	gnome2_src_configure \
+		--disable-test-application \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable glade glade-catalogue) \
+		$(use_with crypt gnutls) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		${myconf}
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	gnome2_src_install
+	mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-libs/vte/, x11-libs/vte/files/
@ 2016-10-15 17:41 Felix Janda
  0 siblings, 0 replies; 6+ messages in thread
From: Felix Janda @ 2016-10-15 17:41 UTC (permalink / raw
  To: gentoo-commits

commit:     8e73690210f18f46c2b6ef2125f329d13608a615
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sat Oct 15 13:26:30 2016 +0000
Commit:     Felix Janda <felix.janda <AT> posteo <DOT> de>
CommitDate: Sat Oct 15 17:37:38 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=8e736902

x11-libs/vte: in tree branch 2.91 works

 x11-libs/vte/Manifest                              |  3 -
 x11-libs/vte/files/vte-0.42.4-fix-musl-NULLs.patch | 72 --------------------
 x11-libs/vte/vte-0.42.4-r99.ebuild                 | 78 ----------------------
 3 files changed, 153 deletions(-)

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 2b88c2d..4da657d 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -3,9 +3,6 @@ AUX vte-0.28.2-add_HAVE_ROUND.patch 430 SHA256 0af936b79e7ecbee4fa14a7dd8853f261
 AUX vte-0.28.2-interix.patch 1566 SHA256 0c3bd451d2a48dd38b375fc7d72b675bbfcbcda66f6fbcdd20eeee315727d518 SHA512 f02574f96355c6cedde05d0877d3bf50e7777d210484a80b6e95e597b0bb225f5968649e67f67d7f112f50302ae6566e4f3d8c59d7a5b65fc95601cac00868d7 WHIRLPOOL cd444a499735517fd523e358fa0ad39f9bd8771911da18f06ddb453cdabace3cdb20e2f9aa13428efb1e6b1227ff9e10b56eb3d27616714ac873eb2a64796ae4
 AUX vte-0.28.2-limit-arguments.patch 1477 SHA256 164af2b6756329f1ceb0cac77b5e6bc47d486e1bb0b4e5d3a6fc284e4e7f0ae9 SHA512 e5639d94fd455195c354d03cab04bbb73eff98bc540c813cccf4ab5eb793f4c8ae645fcf2bd502924ed4d38412101341deaf2d28ea8aaea3530a98ffbba8256d WHIRLPOOL a0d9b077d9748c4cfe26ea03c16d9b29ed7c62e994639ae6510b7b50c4cd91c5215337da9310297dbf2bd105fabe85c45453e998c0aa34445cdcdd7192307739
 AUX vte-0.30.1-alt-meta.patch 2490 SHA256 31a46fee8fe59bd1d6df54bc502b608fe80da57bf3786e2dc6e9856a4e793ed6 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430 WHIRLPOOL bc51d9467bb13d627e7355872db5777e3d39ca07753dda9237110f8857d16bca5f8bc4334f9d97df54a2fcbc9234f123247ec8f40508e8120f00ffc46ff0a570
-AUX vte-0.42.4-fix-musl-NULLs.patch 3766 SHA256 acc4d0673cae030b95d65844ae16523d21af0947469a87432790c4f6eb354571 SHA512 cbf5eb60e3cf02570389f705e119430c32e133abc30338dc5ed4022aed7c11c3e3caf70d61e714bd32621c45b72d828137089395d41d7248165b3e140c41f89c WHIRLPOOL 2c85a7f5927f2b35c83af4cb2befe60de1c605bd3549a18c8bc5a59ec9601966b53630a2e49ee6d3eefe4f3b1061c95c46059421766e85a10e4e92cd0e7fe28c
 DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c
-DIST vte-0.42.4.tar.xz 928048 SHA256 08c88bf5c0aa1dfa3711e2e83b784fb5ea82025661f30b54e93eebd5f4bce113 SHA512 871b47d976ae8faafabd2b9dd092b40b2b452fcfd7f60182db7c12ade0c265a1810e811a9a54b6a2c2061ff05f06743b90057babf300b98f391481bb02265fb5 WHIRLPOOL e3e9fbf5303770244b10259f1a07e41a7c0168debda2e81673f8fa1e19f591a4d2c643f614636e691ecaf22fc00eb8fce79d9d4a8d20c899f5a7e4ac187259db
 EBUILD vte-0.28.2-r207.ebuild 2783 SHA256 f496d33402c8f4d2ca1ccae69ed1a7b1da7466be587bd2be11499829448611e3 SHA512 b1cc15d36eb99a1eed8ffa8beb475f01074053d419741106cb5485a53eb2bd4116eafc4d55a1d7d51cdc2a88fdbbefa5fa0b1cf4f5e4d29461e2f140605ee422 WHIRLPOOL 302ad598d4e8499fe1871b87e4853258597f4db7451421b99c1f8d753dbdd636e4b6d5bd12f00d9168d9dbfa386d42a01d27874b8587eac033aaa912a7b3b1c8
-EBUILD vte-0.42.4-r99.ebuild 1683 SHA256 1ad4007b96550a89866cd0c4871dd09a241823d3ac189a222732562a7cf9d575 SHA512 4a6ca93cef1d4cf6148e52f06b60d625770a50f92f6a9de5312c607290e5a2b4e00ebfe0b05d9214f0bd66c0ac97321a875897071bba76e730c95949d23dbc1e WHIRLPOOL 2419e1149b194b336c970265e20a632b2e8fcef895f018fdf1beb68712842f8107a4054b497a44a2d60f0d4651a324ca622b4364c628396613b5035d4eeab02f
 MISC metadata.xml 348 SHA256 e70b7fc4a21f1a7caba00ef2dcc656a7e79e15e0459519e260a27136fb6f0d88 SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4 WHIRLPOOL 15b683c11d7ab6a5648686b2b6a66dd1cf6034a612504a83f96b81253e3089a278bb7c70681ebe543e6904aab9e9f3d3579505cec4caf3df5ed44b34391a4138

diff --git a/x11-libs/vte/files/vte-0.42.4-fix-musl-NULLs.patch b/x11-libs/vte/files/vte-0.42.4-fix-musl-NULLs.patch
deleted file mode 100644
index 5b9e976..0000000
--- a/x11-libs/vte/files/vte-0.42.4-fix-musl-NULLs.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Naur vte-0.42.4.orig/src/pty.cc vte-0.42.4/src/pty.cc
---- vte-0.42.4.orig/src/pty.cc	2016-02-27 14:27:22.376000000 +0000
-+++ vte-0.42.4/src/pty.cc	2016-02-27 14:27:36.496000000 +0000
-@@ -401,7 +401,7 @@
- 	array = g_ptr_array_sized_new (g_hash_table_size (table) + 1);
-         g_hash_table_iter_init(&iter, table);
-         while (g_hash_table_iter_next(&iter, (void**) &name, (void**) &value)) {
--                g_ptr_array_add (array, g_strconcat (name, "=", value, NULL));
-+                g_ptr_array_add (array, g_strconcat (name, "=", value, (char *)NULL));
-         }
-         g_assert(g_hash_table_size(table) == array->len);
- 	g_hash_table_destroy (table);
-diff -Naur vte-0.42.4.orig/src/vte.cc vte-0.42.4/src/vte.cc
---- vte-0.42.4.orig/src/vte.cc	2016-02-27 14:27:22.379000000 +0000
-+++ vte-0.42.4/src/vte.cc	2016-02-27 14:27:36.499000000 +0000
-@@ -4654,7 +4654,7 @@
-         vte_terminal_set_font(terminal, terminal->pvt->unscaled_font_desc);
-         vte_terminal_set_padding(terminal);
- 
--        gtk_widget_style_get(widget, "cursor-aspect-ratio", &aspect, NULL);
-+        gtk_widget_style_get(widget, "cursor-aspect-ratio", &aspect, (char *)NULL);
-         if (aspect != terminal->pvt->cursor_aspect_ratio) {
-                 terminal->pvt->cursor_aspect_ratio = aspect;
-                 _vte_invalidate_cursor_once(terminal, FALSE);
-@@ -7475,7 +7475,7 @@
- 
-                                 g_object_get (gtk_widget_get_settings(widget),
-                                               "gtk-enable-primary-paste",
--                                              &do_paste, NULL);
-+                                              &do_paste, (char *)NULL);
-                                 if (do_paste)
-                                         vte_terminal_paste_primary(terminal);
- 				handled = do_paste;
-@@ -7913,7 +7913,7 @@
- 
- 	/* Create an owned font description. */
-         context = gtk_widget_get_style_context(&terminal->widget);
--        gtk_style_context_get(context, GTK_STATE_FLAG_NORMAL, "font", &desc, NULL);
-+        gtk_style_context_get(context, GTK_STATE_FLAG_NORMAL, "font", &desc, (char *)NULL);
- 	pango_font_description_set_family_static (desc, "monospace");
- 	if (font_desc != NULL) {
- 		pango_font_description_merge (desc, font_desc, TRUE);
-@@ -8715,7 +8715,7 @@
-                      "gtk-cursor-blink", &blink,
-                      "gtk-cursor-blink-time", &blink_time,
-                      "gtk-cursor-blink-timeout", &blink_timeout,
--                     NULL);
-+                     (char *)NULL);
- 
-         _vte_debug_print(VTE_DEBUG_MISC,
-                          "Cursor blinking settings setting: blink=%d time=%d timeout=%d\n",
-@@ -11799,7 +11799,7 @@
-         case VTE_CURSOR_BLINK_SYSTEM:
-                 g_object_get(gtk_widget_get_settings(GTK_WIDGET(terminal)),
-                                                      "gtk-cursor-blink",
--                                                     &blink, NULL);
-+                                                     &blink, (char *)NULL);
-                 break;
-         case VTE_CURSOR_BLINK_ON:
-                 blink = TRUE;
-diff -Naur vte-0.42.4.orig/src/vtedraw.cc vte-0.42.4/src/vtedraw.cc
---- vte-0.42.4.orig/src/vtedraw.cc	2016-02-27 14:27:22.380000000 +0000
-+++ vte-0.42.4/src/vtedraw.cc	2016-02-27 14:27:36.501000000 +0000
-@@ -629,7 +629,7 @@
- {
- 	GtkSettings *settings = gtk_settings_get_for_screen (screen);
- 	int fontconfig_timestamp;
--	g_object_get (settings, "gtk-fontconfig-timestamp", &fontconfig_timestamp, NULL);
-+	g_object_get (settings, "gtk-fontconfig-timestamp", &fontconfig_timestamp, (char *)NULL);
- 	return font_info_create_for_context (gdk_pango_context_get_for_screen (screen),
- 					     desc, language, fontconfig_timestamp);
- }

diff --git a/x11-libs/vte/vte-0.42.4-r99.ebuild b/x11-libs/vte/vte-0.42.4-r99.ebuild
deleted file mode 100644
index 6603997..0000000
--- a/x11-libs/vte/vte-0.42.4-r99.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 vala
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
-
-LICENSE="LGPL-2+"
-SLOT="2.91"
-IUSE="+crypt debug glade +introspection vala"
-KEYWORDS="amd64 arm ~mips ppc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=x11-libs/gtk+-3.8:3[introspection?]
-	>=x11-libs/pango-1.22.0
-
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXft
-
-	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	crypt?  ( >=net-libs/gnutls-3.2.7 )
-"
-RDEPEND="${RDEPEND}
-	!x11-libs/vte:2.90[glade]
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-musl-NULLs.patch
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		myconf="${myconf} --disable-Bsymbolic"
-
-		# interix stropts.h is empty...
-		export ac_cv_header_stropts_h=no
-	fi
-
-	# Python bindings are via gobject-introspection
-	# Ex: from gi.repository import Vte
-	gnome2_src_configure \
-		--disable-test-application \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable glade glade-catalogue) \
-		$(use_with crypt gnutls) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		${myconf}
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	gnome2_src_install
-	mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-libs/vte/, x11-libs/vte/files/
@ 2017-03-02 18:40 Aric Belsito
  0 siblings, 0 replies; 6+ messages in thread
From: Aric Belsito @ 2017-03-02 18:40 UTC (permalink / raw
  To: gentoo-commits

commit:     f302c8e9de129d5d8a6b2cd23e93c0c1bdfb6408
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Mar  2 18:38:31 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Mar  2 18:40:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=f302c8e9

x11-libs/vte: version bump to 0.28.2-r208

appease repoman

 x11-libs/vte/Manifest                              |  6 +-
 ...0.28.2-repaint-after-change-scroll-region.patch | 86 ++++++++++++++++++++++
 x11-libs/vte/metadata.xml                          |  3 -
 x11-libs/vte/vte-0.28.2-r207.ebuild                |  7 +-
 ...e-0.28.2-r207.ebuild => vte-0.28.2-r208.ebuild} | 34 +++++----
 5 files changed, 112 insertions(+), 24 deletions(-)

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 4da657d..ccb0b36 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -2,7 +2,9 @@ AUX vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch 161 SHA256 bb8bfcb6d88f40dba0025e9
 AUX vte-0.28.2-add_HAVE_ROUND.patch 430 SHA256 0af936b79e7ecbee4fa14a7dd8853f261aeac82625c87aedeee32f260526e440 SHA512 ffef2c472c955bbab37fc068e842fd7c6ef8a98271c3a71cb26855ea0647e2d356c59e614ae13f66ccd884af269e24f0242ebbf5c94702e43839f9f568a2af5c WHIRLPOOL 73c8b43ab70ce8af6d6d32f72d52b0e8d403fd3fcf0afbbf7476ce17738551142121d54438e9f85bb42e7769fffc5637eacc5783c0506ad3cbde752afe5e497b
 AUX vte-0.28.2-interix.patch 1566 SHA256 0c3bd451d2a48dd38b375fc7d72b675bbfcbcda66f6fbcdd20eeee315727d518 SHA512 f02574f96355c6cedde05d0877d3bf50e7777d210484a80b6e95e597b0bb225f5968649e67f67d7f112f50302ae6566e4f3d8c59d7a5b65fc95601cac00868d7 WHIRLPOOL cd444a499735517fd523e358fa0ad39f9bd8771911da18f06ddb453cdabace3cdb20e2f9aa13428efb1e6b1227ff9e10b56eb3d27616714ac873eb2a64796ae4
 AUX vte-0.28.2-limit-arguments.patch 1477 SHA256 164af2b6756329f1ceb0cac77b5e6bc47d486e1bb0b4e5d3a6fc284e4e7f0ae9 SHA512 e5639d94fd455195c354d03cab04bbb73eff98bc540c813cccf4ab5eb793f4c8ae645fcf2bd502924ed4d38412101341deaf2d28ea8aaea3530a98ffbba8256d WHIRLPOOL a0d9b077d9748c4cfe26ea03c16d9b29ed7c62e994639ae6510b7b50c4cd91c5215337da9310297dbf2bd105fabe85c45453e998c0aa34445cdcdd7192307739
+AUX vte-0.28.2-repaint-after-change-scroll-region.patch 3817 SHA256 95ff6eb5d17e7c209aa4751dfd150a1baa97d8b5d1b31658d7645751eb38cad6 SHA512 46a54c96889c3a0c5a293a097f777dd2e24e5a3025b808d7fb0bbfe71e8938f7d30ba26a05e67cb6b63ad59719eace57d0f6e0ff9f2860fbe9f12c36e022b8ec WHIRLPOOL 5aed1b127b364e02a127b4d90bdfcd4d2cdb5b646b0ca1097401f8037cc28d5c309c8138070982378ef30bd0bb4e20795bb14bea536cebbc7d3734c5a5c6355a
 AUX vte-0.30.1-alt-meta.patch 2490 SHA256 31a46fee8fe59bd1d6df54bc502b608fe80da57bf3786e2dc6e9856a4e793ed6 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430 WHIRLPOOL bc51d9467bb13d627e7355872db5777e3d39ca07753dda9237110f8857d16bca5f8bc4334f9d97df54a2fcbc9234f123247ec8f40508e8120f00ffc46ff0a570
 DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c
-EBUILD vte-0.28.2-r207.ebuild 2783 SHA256 f496d33402c8f4d2ca1ccae69ed1a7b1da7466be587bd2be11499829448611e3 SHA512 b1cc15d36eb99a1eed8ffa8beb475f01074053d419741106cb5485a53eb2bd4116eafc4d55a1d7d51cdc2a88fdbbefa5fa0b1cf4f5e4d29461e2f140605ee422 WHIRLPOOL 302ad598d4e8499fe1871b87e4853258597f4db7451421b99c1f8d753dbdd636e4b6d5bd12f00d9168d9dbfa386d42a01d27874b8587eac033aaa912a7b3b1c8
-MISC metadata.xml 348 SHA256 e70b7fc4a21f1a7caba00ef2dcc656a7e79e15e0459519e260a27136fb6f0d88 SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4 WHIRLPOOL 15b683c11d7ab6a5648686b2b6a66dd1cf6034a612504a83f96b81253e3089a278bb7c70681ebe543e6904aab9e9f3d3579505cec4caf3df5ed44b34391a4138
+EBUILD vte-0.28.2-r207.ebuild 2889 SHA256 3a79b6ff9c6a211ab77f5f0f6d3996ce9cdfaeffd8d587c4bbf548920ff3cbd4 SHA512 6f085527f189a682112ee0102bad17c5c646bf79b824b2bc1efd6f6d3aeed3166537211c597ce348e09b982048e99fbfcd9d153855d5743ef6d822317b557a95 WHIRLPOOL 5b382ee38aa1e7f3052fec25a58b5894cee280bad1c4d9f08c9de1d57c4dd2e63357d2e33097972aba26a15b26f6841485d026d2e31dbb8173e126def8ce3964
+EBUILD vte-0.28.2-r208.ebuild 3065 SHA256 e6daea3be6ea7818f5ae2293d568520f6d4b8e67c19b9e5f874987a858068321 SHA512 3c2f4253db9e5675e3d43d37a1a1a8f674502e8f1f79439aaf05f51248c96e99b981fbf656f56343bcc5d2b07e1590837977e756ae4bc8e510448be9807c5cc1 WHIRLPOOL 1307cbaae55afc42d1534f896dd56073c5e0d8b7d77c053cd82f4267553f23547680bba6d8e5ee85c7c5f44d521beb66488c4f52da8e042b7389a583c7b2c5ef
+MISC metadata.xml 253 SHA256 8f92439176f4cd2ba6a060c523c6b29ab210cd9aab7903b6db6eecc6654b1e21 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 WHIRLPOOL d5d853bd8a39a54c45728e16a1aa295e014e0a3a105a01ec6b3c93a4f53d7b7055644708301751b7f5be68543056d3f0bd611d5ce0be442eb5d06f5e032fe154

diff --git a/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch b/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch
new file mode 100644
index 0000000..86e5471
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch
@@ -0,0 +1,86 @@
+https://git.gnome.org/browse/vte/commit/?id=88e8e89560a62d0981ce2b18974a230d0a07dbdd
+
+From 88e8e89560a62d0981ce2b18974a230d0a07dbdd Mon Sep 17 00:00:00 2001
+From: Micah Cowan <micah@cowan.name>
+Date: Tue, 22 Oct 2013 23:30:43 +0200
+Subject: widget: Fix invalidation region
+
+When the sequence handler moves the cursor into the restricted scrolling region,
+the bbox needs to be reset, too.
+Fixes glitches with interspersing writes to the bottom line with scrolls of the
+upper region, and also fixes missing screen redraws when using mosh.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=542087
+https://bugzilla.gnome.org/show_bug.cgi?id=686097
+
+diff --git a/src/vte.c b/src/vte.c
+index 9f6d7d8..a4d9d25 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -4077,6 +4077,7 @@ vte_terminal_process_incoming(VteTerminal *terminal)
+ 	long wcount, start, delta;
+ 	gboolean leftovers, modified, bottom, again;
+ 	gboolean invalidated_text;
++	gboolean in_scroll_region;
+ 	GArray *unichars;
+ 	struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL;
+ 
+@@ -4096,6 +4097,10 @@ vte_terminal_process_incoming(VteTerminal *terminal)
+ 	cursor = screen->cursor_current;
+ 	cursor_visible = terminal->pvt->cursor_visible;
+ 
++	in_scroll_region = screen->scrolling_restricted
++	    && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
++	    && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
++
+ 	/* We should only be called when there's data to process. */
+ 	g_assert(terminal->pvt->incoming ||
+ 		 (terminal->pvt->pending->len > 0));
+@@ -4194,6 +4199,8 @@ skip_chunk:
+ 		 * points to the first character which isn't part of this
+ 		 * sequence. */
+ 		if ((match != NULL) && (match[0] != '\0')) {
++			gboolean new_in_scroll_region;
++
+ 			/* Call the right sequence handler for the requested
+ 			 * behavior. */
+ 			_vte_terminal_handle_sequence(terminal,
+@@ -4204,12 +4211,21 @@ skip_chunk:
+ 			start = (next - wbuf);
+ 			modified = TRUE;
+ 
+-			/* if we have moved during the sequence handler, restart the bbox */
++			new_in_scroll_region = screen->scrolling_restricted
++			    && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
++			    && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
++
++			delta = screen->scroll_delta;	/* delta may have changed from sequence. */
++
++			/* if we have moved greatly during the sequence handler, or moved
++                         * into a scroll_region from outside it, restart the bbox.
++                         */
+ 			if (invalidated_text &&
+-					(screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
+-					 screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK     ||
+-					 screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
+-					 screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) {
++					((new_in_scroll_region && !in_scroll_region) ||
++					 (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
++					  screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK     ||
++					  screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
++					  screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) {
+ 				/* Clip off any part of the box which isn't already on-screen. */
+ 				bbox_topleft.x = MAX(bbox_topleft.x, 0);
+ 				bbox_topleft.y = MAX(bbox_topleft.y, delta);
+@@ -4229,6 +4245,8 @@ skip_chunk:
+ 				bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT;
+ 				bbox_topleft.x = bbox_topleft.y = G_MAXINT;
+ 			}
++
++			in_scroll_region = new_in_scroll_region;
+ 		} else
+ 		/* Second, we have a NULL match, and next points to the very
+ 		 * next character in the buffer.  Insert the character which
+-- 
+cgit v0.10.2
+

diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml
index e72feac..996e7ca 100644
--- a/x11-libs/vte/metadata.xml
+++ b/x11-libs/vte/metadata.xml
@@ -5,7 +5,4 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="glade">Provide integration with <pkg>dev-util/glade</pkg>.</flag>
-	</use>
 </pkgmetadata>

diff --git a/x11-libs/vte/vte-0.28.2-r207.ebuild b/x11-libs/vte/vte-0.28.2-r207.ebuild
index bd17758..f28f678 100644
--- a/x11-libs/vte/vte-0.28.2-r207.ebuild
+++ b/x11-libs/vte/vte-0.28.2-r207.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="debug +introspection python"
 
 RDEPEND="
@@ -21,7 +20,7 @@ RDEPEND="
 	>=x11-libs/gtk+-2.20:2[introspection?]
 	>=x11-libs/pango-1.22.0
 
-	sys-libs/ncurses
+	sys-libs/ncurses:0=
 	x11-libs/libX11
 	x11-libs/libXft
 

diff --git a/x11-libs/vte/vte-0.28.2-r207.ebuild b/x11-libs/vte/vte-0.28.2-r208.ebuild
similarity index 75%
copy from x11-libs/vte/vte-0.28.2-r207.ebuild
copy to x11-libs/vte/vte-0.28.2-r208.ebuild
index bd17758..27a7ec3 100644
--- a/x11-libs/vte/vte-0.28.2-r207.ebuild
+++ b/x11-libs/vte/vte-0.28.2-r208.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils gnome2 python-r1
+inherit gnome2 python-r1
 
 DESCRIPTION="GNOME terminal widget"
 HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="debug +introspection python"
 
 RDEPEND="
@@ -21,7 +19,7 @@ RDEPEND="
 	>=x11-libs/gtk+-2.20:2[introspection?]
 	>=x11-libs/pango-1.22.0
 
-	sys-libs/ncurses
+	sys-libs/ncurses:0=
 	x11-libs/libX11
 	x11-libs/libXft
 
@@ -39,22 +37,28 @@ DEPEND="${RDEPEND}
 "
 PDEPEND="x11-libs/gnome-pty-helper"
 
-src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
+PATCHES=(
 	# https://bugzilla.gnome.org/show_bug.cgi?id=663779
-	epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
+	"${FILESDIR}"/${PN}-0.30.1-alt-meta.patch
 
 	# https://bugzilla.gnome.org/show_bug.cgi?id=652290
-	epatch "${FILESDIR}"/${PN}-0.28.2-interix.patch
+	"${FILESDIR}"/${PN}-0.28.2-interix.patch
 
 	# Fix CVE-2012-2738, upstream bug #676090
-	epatch "${FILESDIR}"/${PN}-0.28.2-limit-arguments.patch
+	"${FILESDIR}"/${PN}-0.28.2-limit-arguments.patch
+
+	# Fix https://bugzilla.gnome.org/show_bug.cgi?id=542087
+	# Patch from https://github.com/pld-linux/vte0/commit/1e8dce16b239e5d378b02e4d04a60e823df36257
+	"${FILESDIR}"/${PN}-0.28.2-repaint-after-change-scroll-region.patch
 
 	# Fix musl issues, bug #554416
-	epatch "${FILESDIR}"/${PN}-0.28.2-add_HAVE_ROUND.patch
-	epatch "${FILESDIR}"/${PN}-0.28.2-GNU_SOURCE-for-ptsname_r.patch
+	"${FILESDIR}"/${PN}-0.28.2-add_HAVE_ROUND.patch
+	"${FILESDIR}"/${PN}-0.28.2-GNU_SOURCE-for-ptsname_r.patch
+)
 
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+src_prepare() {
 	prepare_python() {
 		mkdir -p "${BUILD_DIR}" || die
 	}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-libs/vte/, x11-libs/vte/files/
@ 2018-12-04 15:56 Anthony G. Basile
  0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2018-12-04 15:56 UTC (permalink / raw
  To: gentoo-commits

commit:     c5d38fa48fe5cc72fe10113a9529951060f90144
Author:     callmetango <callmetango <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Tue Nov  6 14:21:50 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Dec  4 15:54:55 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=c5d38fa4

x11-libs/vte: version bump to 0.54.2

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 x11-libs/vte/Manifest                              |  4 +-
 .../files/vte-0.54.2-musl-remove-W_EXITCODE.patch  | 23 ++++++
 x11-libs/vte/metadata.xml                          |  3 +
 x11-libs/vte/vte-0.54.2.ebuild                     | 91 ++++++++++++++++++++++
 4 files changed, 120 insertions(+), 1 deletion(-)

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 2562fed..546a2da 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1 +1,3 @@
-DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c
+DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
+DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
+DIST vte-0.54.2.tar.xz 1087628 BLAKE2B 9e613ff514beef395f88677ebb25d278df3107b90af07f5d7cbebc44f93d5a6784d65b56cca2c3c020bbf20b0f406a933b97678004bbb586e1485f4aeda08aa9 SHA512 214ec69110d6ad6caa9bc41fb741874bfcf27f20f34d3ae745b13903c574f9c854f7e0dadbae3dbc8ce04c5a6eb818a433c50569c1ef802501a9a078385f23fc

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
new file mode 100644
index 0000000..dfbc366
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.54.2-musl-remove-W_EXITCODE.patch
@@ -0,0 +1,23 @@
+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/metadata.xml b/x11-libs/vte/metadata.xml
index 996e7ca..9889b0b 100644
--- a/x11-libs/vte/metadata.xml
+++ b/x11-libs/vte/metadata.xml
@@ -5,4 +5,7 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<use>
+		<flag name="glade">Installs catalog files for <pkg>dev-util/glade</pkg></flag>
+	</use>
 </pkgmetadata>

diff --git a/x11-libs/vte/vte-0.54.2.ebuild b/x11-libs/vte/vte-0.54.2.ebuild
new file mode 100644
index 0000000..5a85452
--- /dev/null
+++ b/x11-libs/vte/vte-0.54.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.32"
+
+inherit autotools gnome2 vala
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="2.91"
+IUSE="+crypt debug glade +introspection vala vanilla"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libpcre2-10.21
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${RDEPEND}
+	!x11-libs/vte:2.90[glade]
+"
+
+src_prepare() {
+	if ! use vanilla; then
+		# First half of http://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/vte291-command-notify-scroll-speed.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${PN}-0.54.1-command-notify.patch
+	fi
+
+	eapply "${FILESDIR}/${P}-musl-remove-W_EXITCODE.patch"
+	eautoreconf
+
+	use vala && vala_src_prepare
+
+	# build fails because of -Werror with gcc-5.x
+	sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
+	gnome2_src_configure \
+		--disable-static \
+		--with-gtk=3.0 \
+		--with-iconv \
+		$(use_enable debug) \
+		$(use_enable glade glade-catalogue) \
+		$(use_with crypt gnutls) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		${myconf}
+}
+
+src_install() {
+	gnome2_src_install
+	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-libs/vte/, x11-libs/vte/files/
@ 2021-05-30 15:43 Jory Pratt
  0 siblings, 0 replies; 6+ messages in thread
From: Jory Pratt @ 2021-05-30 15:43 UTC (permalink / raw
  To: gentoo-commits

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 <mattst88@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


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-05-30 15:43 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-27 14:38 [gentoo-commits] proj/musl:master commit in: x11-libs/vte/, x11-libs/vte/files/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2021-05-30 15:43 Jory Pratt
2018-12-04 15:56 Anthony G. Basile
2017-03-02 18:40 Aric Belsito
2016-10-15 17:41 Felix Janda
2015-07-18 23:07 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox