CVS commit: pkgsrc/x11/vte3

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jun 21 09:34:50 UTC 2018

Modified Files:
        pkgsrc/x11/vte3: distinfo
        pkgsrc/x11/vte3/patches: patch-src_app_app.cc

Log Message:
vte3: Fix previous.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/vte3/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/vte3/patches/patch-src_app_app.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/vte3/distinfo
diff -u pkgsrc/x11/vte3/distinfo:1.6 pkgsrc/x11/vte3/distinfo:1.7
--- pkgsrc/x11/vte3/distinfo:1.6        Fri Jun 15 10:44:15 2018
+++ pkgsrc/x11/vte3/distinfo    Thu Jun 21 09:34:50 2018
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2018/06/15 10:44:15 jperkin Exp $
+$NetBSD: distinfo,v 1.7 2018/06/21 09:34:50 jperkin Exp $
 
 SHA1 (vte-0.52.2.tar.xz) = be8de64f8584ada23461db8e0a4dce2e650de5ce
 RMD160 (vte-0.52.2.tar.xz) = 3707a2a4a0ca7bbc562dbf2d570e7e4a4a15afef
 SHA512 (vte-0.52.2.tar.xz) = fc760973efa1eb1f100447cdf0d9b944b74f5ba7e3ae1ae1d0acadaebd540fff19f7edc741685ba944147c151223942a80f8f3dad3602469f1aff5c44f6cc846
 Size (vte-0.52.2.tar.xz) = 1011696 bytes
 SHA1 (patch-configure) = 9a570f27c0ec4e4680d517a8c2498b37728d52ae
-SHA1 (patch-src_app_app.cc) = 184c71f05ebc8177fbf6375bb051594e21cae3d6
+SHA1 (patch-src_app_app.cc) = 99fa242665d799205df305af5c0b15938db92c7c
 SHA1 (patch-src_pty.cc) = cc2e0be62a90ffefcb21f8b07cb25f281b30df1e
 SHA1 (patch-src_vte.cc) = b07315fef8593e6b51427ac039b9b4724e9fd18b
 SHA1 (patch-src_vtedraw.cc) = 1deab7738ae7c7bbb53e5b951df4d8a6ad9312f9

Index: pkgsrc/x11/vte3/patches/patch-src_app_app.cc
diff -u pkgsrc/x11/vte3/patches/patch-src_app_app.cc:1.2 pkgsrc/x11/vte3/patches/patch-src_app_app.cc:1.3
--- pkgsrc/x11/vte3/patches/patch-src_app_app.cc:1.2    Fri Jun 15 10:44:15 2018
+++ pkgsrc/x11/vte3/patches/patch-src_app_app.cc        Thu Jun 21 09:34:50 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_app_app.cc,v 1.2 2018/06/15 10:44:15 jperkin Exp $
+$NetBSD: patch-src_app_app.cc,v 1.3 2018/06/21 09:34:50 jperkin Exp $
 
 Fix NetBSD build.
 
@@ -12,17 +12,15 @@ Fix NetBSD build.
  
  #include <glib.h>
  #include <glib/gprintf.h>
-@@ -78,8 +79,8 @@ public:
-         char** exec_argv{nullptr};
-         char** environment{nullptr};
-         GdkPixbuf* background_pixbuf{nullptr};
--        GdkRGBA bg_color{1.0, 1.0, 1.0, 1.0};
--        GdkRGBA fg_color{0.0, 0.0, 0.0, 1.0};
-+        GdkRGBA bg_color{(gdouble)1.0, (gdouble)1.0, (gdouble)1.0, (gdouble)1.0};
-+        GdkRGBA fg_color{(gdouble)0.0, (gdouble)0.0, (gdouble)0.0, (gdouble)1.0};
-         GdkRGBA cursor_bg_color{};
-         GdkRGBA cursor_fg_color{};
-         GdkRGBA hl_bg_color{};
+@@ -306,7 +307,7 @@ public:
+                 else
+                         alpha = get_alpha();
+ 
+-                GdkRGBA color{bg_color};
++                GdkRGBA color = bg_color;
+                 color.alpha = alpha;
+                 return color;
+         }
 @@ -1257,7 +1258,7 @@ vteapp_window_fork(VteappWindow* window,
          auto pid = fork();
          switch (pid) {