jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mimadrid 2017-11-09 09:24:43 +01:00
parent 1b1cc34020
commit e227398955
No known key found for this signature in database
GPG Key ID: 4D0F6894D41C6957
3 changed files with 2 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch
View File

@ -1,26 +0,0 @@
diff --git a/src/vteconv.cc b/src/vteconv.cc
index b78d3928..5cb63e7e 100644
--- a/src/vteconv.cc
+++ b/src/vteconv.cc
@@ -771,7 +771,7 @@ int
main (int argc,
char *argv[])
{
- g_test_init (&argc, &argv, NULL);
+ g_test_init (&argc, &argv, (char *)NULL);
g_test_add_func ("/vte/conv/utf8/strlen", test_utf8_strlen);
g_test_add_func ("/vte/conv/utf8/validate", test_utf8_validate);
diff --git a/src/vtetypes.cc b/src/vtetypes.cc
index 1365a295..8f38c9d9 100644
--- a/src/vtetypes.cc
+++ b/src/vtetypes.cc
@@ -407,7 +407,7 @@ test_util_smart_fd(void)
int
main(int argc, char *argv[])
{
- g_test_init (&argc, &argv, NULL);
+ g_test_init (&argc, &argv, (char *)NULL);
g_test_add_func("/vte/c++/grid/coords", test_grid_coords);
g_test_add_func("/vte/c++/grid/span", test_grid_span);

13
pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 2330939d..e0ac14eb 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -3409,7 +3409,7 @@ vte_sequence_handler_iterm2_1337(VteTerminalPrivate *that, GValueArray *params)
#define VTE_SEQUENCE_HANDLER(name) name
static const struct vteseq_n_struct *
-vteseq_n_lookup (register const char *str, register unsigned int len);
+vteseq_n_lookup (register const char *str, register size_t len);
#include"vteseq-n.cc"
#undef VTE_SEQUENCE_HANDLER

11
pkgs/desktops/gnome-3/core/vte/ng.nix
View File

@ -2,22 +2,15 @@
gnome3.vte.overrideAttrs (oldAttrs: rec {
name = "vte-ng-${version}";
version = "0.46.1.a";
version = "0.50.2.a";
src = fetchFromGitHub {
owner = "thestinger";
repo = "vte-ng";
rev = version;
sha256 = "125fpibid1liz50d7vbxy71pnm8b01x90xnkr4z3419b90lybr0a";
sha256 = "0i6hfzw9sq8521kz0l7lld2km56r0bfp1hw6kxq3j1msb8z8svcf";
};
# The patches apply the changes from https://github.com/GNOME/vte/pull/7 and
# can be removed once the commits are merged into vte-ng.
patches = [
./fix_g_test_init_calls.patch
./fix_vteseq_n_lookup_declaration.patch
];
preConfigure = oldAttrs.preConfigure + "; ./autogen.sh";
nativeBuildInputs = oldAttrs.nativeBuildInputs or []