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
-}
