pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #31424 from mimadrid/update/vte-ng-0.50.2.a

vte-ng: 0.46.1.a -> 0.50.2.a

authored by Jörg Thalheim and committed by GitHub c882ff9f 8f771da4

+2 -48
unified split
-26
pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch
··· 1 - diff --git a/src/vteconv.cc b/src/vteconv.cc 2 - index b78d3928..5cb63e7e 100644 3 - --- a/src/vteconv.cc 4 - +++ b/src/vteconv.cc 5 - @@ -771,7 +771,7 @@ int 6 - main (int argc, 7 - char *argv[]) 8 - { 9 - - g_test_init (&argc, &argv, NULL); 10 - + g_test_init (&argc, &argv, (char *)NULL); 11 - 12 - g_test_add_func ("/vte/conv/utf8/strlen", test_utf8_strlen); 13 - g_test_add_func ("/vte/conv/utf8/validate", test_utf8_validate); 14 - diff --git a/src/vtetypes.cc b/src/vtetypes.cc 15 - index 1365a295..8f38c9d9 100644 16 - --- a/src/vtetypes.cc 17 - +++ b/src/vtetypes.cc 18 - @@ -407,7 +407,7 @@ test_util_smart_fd(void) 19 - int 20 - main(int argc, char *argv[]) 21 - { 22 - - g_test_init (&argc, &argv, NULL); 23 - + g_test_init (&argc, &argv, (char *)NULL); 24 - 25 - g_test_add_func("/vte/c++/grid/coords", test_grid_coords); 26 - g_test_add_func("/vte/c++/grid/span", test_grid_span);
-13
pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch
··· 1 - diff --git a/src/vteseq.cc b/src/vteseq.cc 2 - index 2330939d..e0ac14eb 100644 3 - --- a/src/vteseq.cc 4 - +++ b/src/vteseq.cc 5 - @@ -3409,7 +3409,7 @@ vte_sequence_handler_iterm2_1337(VteTerminalPrivate *that, GValueArray *params) 6 - #define VTE_SEQUENCE_HANDLER(name) name 7 - 8 - static const struct vteseq_n_struct * 9 - -vteseq_n_lookup (register const char *str, register unsigned int len); 10 - +vteseq_n_lookup (register const char *str, register size_t len); 11 - #include"vteseq-n.cc" 12 - 13 - #undef VTE_SEQUENCE_HANDLER
+2 -9
pkgs/desktops/gnome-3/core/vte/ng.nix
··· 2 2 3 3 gnome3.vte.overrideAttrs (oldAttrs: rec { 4 4 name = "vte-ng-${version}"; 5 - version = "0.46.1.a"; 5 + version = "0.50.2.a"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "thestinger"; 9 9 repo = "vte-ng"; 10 10 rev = version; 11 - sha256 = "125fpibid1liz50d7vbxy71pnm8b01x90xnkr4z3419b90lybr0a"; 11 + sha256 = "0i6hfzw9sq8521kz0l7lld2km56r0bfp1hw6kxq3j1msb8z8svcf"; 12 12 }; 13 - 14 - # The patches apply the changes from https://github.com/GNOME/vte/pull/7 and 15 - # can be removed once the commits are merged into vte-ng. 16 - patches = [ 17 - ./fix_g_test_init_calls.patch 18 - ./fix_vteseq_n_lookup_declaration.patch 19 - ]; 20 13 21 14 preConfigure = oldAttrs.preConfigure + "; ./autogen.sh"; 22 15