CVS commit: pkgsrc/x11/gnome-terminal

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sat Aug 20 21:41:44 UTC 2022

Modified Files:
        pkgsrc/x11/gnome-terminal: distinfo
        pkgsrc/x11/gnome-terminal/patches: patch-src_server.c
            patch-src_terminal-util.c

Log Message:
gnome-terminal: note upstream commit that merges our patches

These will be in the next stable release.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/gnome-terminal/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/gnome-terminal/patches/patch-src_server.c \
    pkgsrc/x11/gnome-terminal/patches/patch-src_terminal-util.c

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

Modified files:

Index: pkgsrc/x11/gnome-terminal/distinfo
diff -u pkgsrc/x11/gnome-terminal/distinfo:1.26 pkgsrc/x11/gnome-terminal/distinfo:1.27
--- pkgsrc/x11/gnome-terminal/distinfo:1.26     Mon May  9 12:26:42 2022
+++ pkgsrc/x11/gnome-terminal/distinfo  Sat Aug 20 21:41:43 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2022/05/09 12:26:42 jperkin Exp $
+$NetBSD: distinfo,v 1.27 2022/08/20 21:41:43 gutteridge Exp $
 
 BLAKE2s (gnome-terminal-3.36.2.tar.xz) = a29f77bb13b2b744ca4cf09cec50c6745d08a7753d0cded64a9b8965a2fc1c87
 SHA512 (gnome-terminal-3.36.2.tar.xz) = 0d691452456dd495b812332f206b6f8a590f67d47a6afce582b2ff0587747c36cb1eaf249080c6a3c3540ef22a50628801165d6c17eeb1b821eea1e244f79a91
 Size (gnome-terminal-3.36.2.tar.xz) = 2528492 bytes
-SHA1 (patch-src_server.c) = 5ebccc438850609336295122235ae28a9bdcc1f3
-SHA1 (patch-src_terminal-util.c) = 2d70d288ccfac9b97447b6200b225213a9b14eaa
+SHA1 (patch-src_server.c) = 9720151a88cd4ab9b00e54b4f286c8239f718ff8
+SHA1 (patch-src_terminal-util.c) = 4957359c8b81239552430ccbef3da11f110473af
 SHA1 (patch-src_terminal.c) = de257a944b5f43c5e385e72c039365306c0d37e6

Index: pkgsrc/x11/gnome-terminal/patches/patch-src_server.c
diff -u pkgsrc/x11/gnome-terminal/patches/patch-src_server.c:1.1 pkgsrc/x11/gnome-terminal/patches/patch-src_server.c:1.2
--- pkgsrc/x11/gnome-terminal/patches/patch-src_server.c:1.1    Sat Jun 20 15:05:48 2020
+++ pkgsrc/x11/gnome-terminal/patches/patch-src_server.c        Sat Aug 20 21:41:44 2022
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_server.c,v 1.1 2020/06/20 15:05:48 nia Exp $
+$NetBSD: patch-src_server.c,v 1.2 2022/08/20 21:41:44 gutteridge Exp $
 
 error: %m is only allowed in syslog(3) like functions [-Werror=format=]
+https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/fd27fa449c8a494c41fcb0a8c127ffa74725b8be
 
 --- src/server.c.orig  2020-03-05 21:43:41.000000000 +0000
 +++ src/server.c
Index: pkgsrc/x11/gnome-terminal/patches/patch-src_terminal-util.c
diff -u pkgsrc/x11/gnome-terminal/patches/patch-src_terminal-util.c:1.1 pkgsrc/x11/gnome-terminal/patches/patch-src_terminal-util.c:1.2
--- pkgsrc/x11/gnome-terminal/patches/patch-src_terminal-util.c:1.1     Sat Jun 20 15:05:48 2020
+++ pkgsrc/x11/gnome-terminal/patches/patch-src_terminal-util.c Sat Aug 20 21:41:44 2022
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_terminal-util.c,v 1.1 2020/06/20 15:05:48 nia Exp $
+$NetBSD: patch-src_terminal-util.c,v 1.2 2022/08/20 21:41:44 gutteridge Exp $
 
 error: %m is only allowed in syslog(3) like functions [-Werror=format=]
+https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/fd27fa449c8a494c41fcb0a8c127ffa74725b8be
 
 --- src/terminal-util.c.orig   2020-03-05 22:09:14.000000000 +0000
 +++ src/terminal-util.c