| 1 |
commit: 7a9753172a464a6e692eb1e2be7d24a68af1d3bb |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 27 14:48:02 2016 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 27 14:48:02 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7a975317 |
| 7 |
|
| 8 |
x11-libs/vte: properly case NULL to (char *) for sentinels |
| 9 |
|
| 10 |
x11-libs/vte/Manifest | 3 + |
| 11 |
x11-libs/vte/files/vte-0.42.4-fix-musl-NULLs.patch | 72 ++++++++++++++++++++ |
| 12 |
x11-libs/vte/vte-0.42.4-r99.ebuild | 78 ++++++++++++++++++++++ |
| 13 |
3 files changed, 153 insertions(+) |
| 14 |
|
| 15 |
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest |
| 16 |
index 141b71f..084ae9e 100644 |
| 17 |
--- a/x11-libs/vte/Manifest |
| 18 |
+++ b/x11-libs/vte/Manifest |
| 19 |
@@ -3,6 +3,9 @@ AUX vte-0.28.2-add_HAVE_ROUND.patch 430 SHA256 0af936b79e7ecbee4fa14a7dd8853f261 |
| 20 |
AUX vte-0.28.2-interix.patch 1566 SHA256 0c3bd451d2a48dd38b375fc7d72b675bbfcbcda66f6fbcdd20eeee315727d518 SHA512 f02574f96355c6cedde05d0877d3bf50e7777d210484a80b6e95e597b0bb225f5968649e67f67d7f112f50302ae6566e4f3d8c59d7a5b65fc95601cac00868d7 WHIRLPOOL cd444a499735517fd523e358fa0ad39f9bd8771911da18f06ddb453cdabace3cdb20e2f9aa13428efb1e6b1227ff9e10b56eb3d27616714ac873eb2a64796ae4 |
| 21 |
AUX vte-0.28.2-limit-arguments.patch 1477 SHA256 164af2b6756329f1ceb0cac77b5e6bc47d486e1bb0b4e5d3a6fc284e4e7f0ae9 SHA512 e5639d94fd455195c354d03cab04bbb73eff98bc540c813cccf4ab5eb793f4c8ae645fcf2bd502924ed4d38412101341deaf2d28ea8aaea3530a98ffbba8256d WHIRLPOOL a0d9b077d9748c4cfe26ea03c16d9b29ed7c62e994639ae6510b7b50c4cd91c5215337da9310297dbf2bd105fabe85c45453e998c0aa34445cdcdd7192307739 |
| 22 |
AUX vte-0.30.1-alt-meta.patch 2490 SHA256 31a46fee8fe59bd1d6df54bc502b608fe80da57bf3786e2dc6e9856a4e793ed6 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430 WHIRLPOOL bc51d9467bb13d627e7355872db5777e3d39ca07753dda9237110f8857d16bca5f8bc4334f9d97df54a2fcbc9234f123247ec8f40508e8120f00ffc46ff0a570 |
| 23 |
+AUX vte-0.42.4-fix-musl-NULLs.patch 3766 SHA256 acc4d0673cae030b95d65844ae16523d21af0947469a87432790c4f6eb354571 SHA512 cbf5eb60e3cf02570389f705e119430c32e133abc30338dc5ed4022aed7c11c3e3caf70d61e714bd32621c45b72d828137089395d41d7248165b3e140c41f89c WHIRLPOOL 2c85a7f5927f2b35c83af4cb2befe60de1c605bd3549a18c8bc5a59ec9601966b53630a2e49ee6d3eefe4f3b1061c95c46059421766e85a10e4e92cd0e7fe28c |
| 24 |
DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c |
| 25 |
+DIST vte-0.42.4.tar.xz 928048 SHA256 08c88bf5c0aa1dfa3711e2e83b784fb5ea82025661f30b54e93eebd5f4bce113 SHA512 871b47d976ae8faafabd2b9dd092b40b2b452fcfd7f60182db7c12ade0c265a1810e811a9a54b6a2c2061ff05f06743b90057babf300b98f391481bb02265fb5 WHIRLPOOL e3e9fbf5303770244b10259f1a07e41a7c0168debda2e81673f8fa1e19f591a4d2c643f614636e691ecaf22fc00eb8fce79d9d4a8d20c899f5a7e4ac187259db |
| 26 |
EBUILD vte-0.28.2-r207.ebuild 3022 SHA256 bfe8faf003e9f10f9a70b27a15e822265bf44fc375b060f7c3735a5c74fcf5a5 SHA512 0546a2af39f62a676328de3942dbc4182d406407ab34b72eeeafd29aa90c4f365e3bc5908dac9ba078d5bb8cecda5f8fbb995dceb455fb24c2d5d53b7de9e4d0 WHIRLPOOL 3905df734234be357499767eedc473e3028d5671eff9d4c62bb7200d2da28e661729e5d2e9f24a19c2313998e7d03a3d703e4d3b6d1cb4b9abd697c7d12ff5a4 |
| 27 |
+EBUILD vte-0.42.4-r99.ebuild 1820 SHA256 20e23be71bbe97a96ed5698f1f1911ac780969483470f625aa5467dc94dcdc3e SHA512 0ff4e4fdb13ec876ecf727dc23461d977ccb190633b4e28219f2fa67f14bb6fd8b9ad4e0676c3cf6ef06c58240a618d6c5afd2e8b8850037169deb0627fda3e8 WHIRLPOOL 49150d3e74a027e00346df886717cec86b319d977d2e0aee69f1e188a8288c838913bff43a033493a52c63b5c282798d0dbe953745d3d5ef1a6b46030feadd0f |
| 28 |
MISC metadata.xml 250 SHA256 86cd2180b3599ddb2bef78131a9c86a37fa1ee7247aa3245e11e7ff6a239e2e0 SHA512 78b3c7ca8d3e9b51aa7901579627ec33ab3754a16b1e86b108d35b6feca57d5565dcba04e5948d52284c212f5a2f6134bbe0912a2a121822ed07d004c7cdd209 WHIRLPOOL c7ad250c312d9537b3b810984fcebab430a9bb9a87c5639ede513b1523e447a98ce2509e208217afbdc3c3cdaf1a9f0a491ea27e2c09efae77cf933e26bde022 |
| 29 |
|
| 30 |
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 |
| 31 |
new file mode 100644 |
| 32 |
index 0000000..5b9e976 |
| 33 |
--- /dev/null |
| 34 |
+++ b/x11-libs/vte/files/vte-0.42.4-fix-musl-NULLs.patch |
| 35 |
@@ -0,0 +1,72 @@ |
| 36 |
+diff -Naur vte-0.42.4.orig/src/pty.cc vte-0.42.4/src/pty.cc |
| 37 |
+--- vte-0.42.4.orig/src/pty.cc 2016-02-27 14:27:22.376000000 +0000 |
| 38 |
++++ vte-0.42.4/src/pty.cc 2016-02-27 14:27:36.496000000 +0000 |
| 39 |
+@@ -401,7 +401,7 @@ |
| 40 |
+ array = g_ptr_array_sized_new (g_hash_table_size (table) + 1); |
| 41 |
+ g_hash_table_iter_init(&iter, table); |
| 42 |
+ while (g_hash_table_iter_next(&iter, (void**) &name, (void**) &value)) { |
| 43 |
+- g_ptr_array_add (array, g_strconcat (name, "=", value, NULL)); |
| 44 |
++ g_ptr_array_add (array, g_strconcat (name, "=", value, (char *)NULL)); |
| 45 |
+ } |
| 46 |
+ g_assert(g_hash_table_size(table) == array->len); |
| 47 |
+ g_hash_table_destroy (table); |
| 48 |
+diff -Naur vte-0.42.4.orig/src/vte.cc vte-0.42.4/src/vte.cc |
| 49 |
+--- vte-0.42.4.orig/src/vte.cc 2016-02-27 14:27:22.379000000 +0000 |
| 50 |
++++ vte-0.42.4/src/vte.cc 2016-02-27 14:27:36.499000000 +0000 |
| 51 |
+@@ -4654,7 +4654,7 @@ |
| 52 |
+ vte_terminal_set_font(terminal, terminal->pvt->unscaled_font_desc); |
| 53 |
+ vte_terminal_set_padding(terminal); |
| 54 |
+ |
| 55 |
+- gtk_widget_style_get(widget, "cursor-aspect-ratio", &aspect, NULL); |
| 56 |
++ gtk_widget_style_get(widget, "cursor-aspect-ratio", &aspect, (char *)NULL); |
| 57 |
+ if (aspect != terminal->pvt->cursor_aspect_ratio) { |
| 58 |
+ terminal->pvt->cursor_aspect_ratio = aspect; |
| 59 |
+ _vte_invalidate_cursor_once(terminal, FALSE); |
| 60 |
+@@ -7475,7 +7475,7 @@ |
| 61 |
+ |
| 62 |
+ g_object_get (gtk_widget_get_settings(widget), |
| 63 |
+ "gtk-enable-primary-paste", |
| 64 |
+- &do_paste, NULL); |
| 65 |
++ &do_paste, (char *)NULL); |
| 66 |
+ if (do_paste) |
| 67 |
+ vte_terminal_paste_primary(terminal); |
| 68 |
+ handled = do_paste; |
| 69 |
+@@ -7913,7 +7913,7 @@ |
| 70 |
+ |
| 71 |
+ /* Create an owned font description. */ |
| 72 |
+ context = gtk_widget_get_style_context(&terminal->widget); |
| 73 |
+- gtk_style_context_get(context, GTK_STATE_FLAG_NORMAL, "font", &desc, NULL); |
| 74 |
++ gtk_style_context_get(context, GTK_STATE_FLAG_NORMAL, "font", &desc, (char *)NULL); |
| 75 |
+ pango_font_description_set_family_static (desc, "monospace"); |
| 76 |
+ if (font_desc != NULL) { |
| 77 |
+ pango_font_description_merge (desc, font_desc, TRUE); |
| 78 |
+@@ -8715,7 +8715,7 @@ |
| 79 |
+ "gtk-cursor-blink", &blink, |
| 80 |
+ "gtk-cursor-blink-time", &blink_time, |
| 81 |
+ "gtk-cursor-blink-timeout", &blink_timeout, |
| 82 |
+- NULL); |
| 83 |
++ (char *)NULL); |
| 84 |
+ |
| 85 |
+ _vte_debug_print(VTE_DEBUG_MISC, |
| 86 |
+ "Cursor blinking settings setting: blink=%d time=%d timeout=%d\n", |
| 87 |
+@@ -11799,7 +11799,7 @@ |
| 88 |
+ case VTE_CURSOR_BLINK_SYSTEM: |
| 89 |
+ g_object_get(gtk_widget_get_settings(GTK_WIDGET(terminal)), |
| 90 |
+ "gtk-cursor-blink", |
| 91 |
+- &blink, NULL); |
| 92 |
++ &blink, (char *)NULL); |
| 93 |
+ break; |
| 94 |
+ case VTE_CURSOR_BLINK_ON: |
| 95 |
+ blink = TRUE; |
| 96 |
+diff -Naur vte-0.42.4.orig/src/vtedraw.cc vte-0.42.4/src/vtedraw.cc |
| 97 |
+--- vte-0.42.4.orig/src/vtedraw.cc 2016-02-27 14:27:22.380000000 +0000 |
| 98 |
++++ vte-0.42.4/src/vtedraw.cc 2016-02-27 14:27:36.501000000 +0000 |
| 99 |
+@@ -629,7 +629,7 @@ |
| 100 |
+ { |
| 101 |
+ GtkSettings *settings = gtk_settings_get_for_screen (screen); |
| 102 |
+ int fontconfig_timestamp; |
| 103 |
+- g_object_get (settings, "gtk-fontconfig-timestamp", &fontconfig_timestamp, NULL); |
| 104 |
++ g_object_get (settings, "gtk-fontconfig-timestamp", &fontconfig_timestamp, (char *)NULL); |
| 105 |
+ return font_info_create_for_context (gdk_pango_context_get_for_screen (screen), |
| 106 |
+ desc, language, fontconfig_timestamp); |
| 107 |
+ } |
| 108 |
|
| 109 |
diff --git a/x11-libs/vte/vte-0.42.4-r99.ebuild b/x11-libs/vte/vte-0.42.4-r99.ebuild |
| 110 |
new file mode 100644 |
| 111 |
index 0000000..94ee8b4 |
| 112 |
--- /dev/null |
| 113 |
+++ b/x11-libs/vte/vte-0.42.4-r99.ebuild |
| 114 |
@@ -0,0 +1,78 @@ |
| 115 |
+# Copyright 1999-2015 Gentoo Foundation |
| 116 |
+# Distributed under the terms of the GNU General Public License v2 |
| 117 |
+# $Id$ |
| 118 |
+ |
| 119 |
+EAPI="5" |
| 120 |
+GCONF_DEBUG="no" |
| 121 |
+VALA_USE_DEPEND="vapigen" |
| 122 |
+ |
| 123 |
+inherit eutils gnome2 vala |
| 124 |
+ |
| 125 |
+DESCRIPTION="Library providing a virtual terminal emulator widget" |
| 126 |
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE" |
| 127 |
+ |
| 128 |
+LICENSE="LGPL-2+" |
| 129 |
+SLOT="2.91" |
| 130 |
+IUSE="+crypt debug glade +introspection vala" |
| 131 |
+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" |
| 132 |
+ |
| 133 |
+RDEPEND=" |
| 134 |
+ >=dev-libs/glib-2.40:2 |
| 135 |
+ >=x11-libs/gtk+-3.8:3[introspection?] |
| 136 |
+ >=x11-libs/pango-1.22.0 |
| 137 |
+ |
| 138 |
+ sys-libs/ncurses:0= |
| 139 |
+ sys-libs/zlib |
| 140 |
+ x11-libs/libX11 |
| 141 |
+ x11-libs/libXft |
| 142 |
+ |
| 143 |
+ glade? ( >=dev-util/glade-3.9:3.10 ) |
| 144 |
+ introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) |
| 145 |
+" |
| 146 |
+DEPEND="${RDEPEND} |
| 147 |
+ $(vala_depend) |
| 148 |
+ >=dev-util/gtk-doc-am-1.13 |
| 149 |
+ >=dev-util/intltool-0.35 |
| 150 |
+ sys-devel/gettext |
| 151 |
+ virtual/pkgconfig |
| 152 |
+ |
| 153 |
+ crypt? ( >=net-libs/gnutls-3.2.7 ) |
| 154 |
+" |
| 155 |
+RDEPEND="${RDEPEND} |
| 156 |
+ !x11-libs/vte:2.90[glade] |
| 157 |
+" |
| 158 |
+ |
| 159 |
+src_prepare() { |
| 160 |
+ epatch "${FILESDIR}"/${P}-fix-musl-NULLs.patch |
| 161 |
+ vala_src_prepare |
| 162 |
+ gnome2_src_prepare |
| 163 |
+} |
| 164 |
+ |
| 165 |
+src_configure() { |
| 166 |
+ local myconf="" |
| 167 |
+ |
| 168 |
+ if [[ ${CHOST} == *-interix* ]]; then |
| 169 |
+ myconf="${myconf} --disable-Bsymbolic" |
| 170 |
+ |
| 171 |
+ # interix stropts.h is empty... |
| 172 |
+ export ac_cv_header_stropts_h=no |
| 173 |
+ fi |
| 174 |
+ |
| 175 |
+ # Python bindings are via gobject-introspection |
| 176 |
+ # Ex: from gi.repository import Vte |
| 177 |
+ gnome2_src_configure \ |
| 178 |
+ --disable-test-application \ |
| 179 |
+ --disable-static \ |
| 180 |
+ $(use_enable debug) \ |
| 181 |
+ $(use_enable glade glade-catalogue) \ |
| 182 |
+ $(use_with crypt gnutls) \ |
| 183 |
+ $(use_enable introspection) \ |
| 184 |
+ $(use_enable vala) \ |
| 185 |
+ ${myconf} |
| 186 |
+} |
| 187 |
+ |
| 188 |
+src_install() { |
| 189 |
+ DOCS="AUTHORS ChangeLog HACKING NEWS README" |
| 190 |
+ gnome2_src_install |
| 191 |
+ mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die |
| 192 |
+} |
Archives