CVS commit: pkgsrc/x11/xfce4-terminal

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Feb 23 20:38:49 UTC 2024

Modified Files:
        pkgsrc/x11/xfce4-terminal: Makefile distinfo
Added Files:
        pkgsrc/x11/xfce4-terminal/patches:
            patch-terminal_terminal-preferences-dialog.c

Log Message:
xfce4-terminal: fix regression with pasting multi-line data


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/x11/xfce4-terminal/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/xfce4-terminal/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xfce4-terminal/patches/patch-terminal_terminal-preferences-dialog.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/xfce4-terminal/Makefile
diff -u pkgsrc/x11/xfce4-terminal/Makefile:1.79 pkgsrc/x11/xfce4-terminal/Makefile:1.80
--- pkgsrc/x11/xfce4-terminal/Makefile:1.79     Thu Feb  8 23:29:47 2024
+++ pkgsrc/x11/xfce4-terminal/Makefile  Fri Feb 23 20:38:49 2024
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.79 2024/02/08 23:29:47 gutteridge Exp $
+# $NetBSD: Makefile,v 1.80 2024/02/23 20:38:49 gutteridge Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=      xfce4-terminal-1.1.2
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  https://archive.xfce.org/src/apps/xfce4-terminal/1.1/
 

Index: pkgsrc/x11/xfce4-terminal/distinfo
diff -u pkgsrc/x11/xfce4-terminal/distinfo:1.25 pkgsrc/x11/xfce4-terminal/distinfo:1.26
--- pkgsrc/x11/xfce4-terminal/distinfo:1.25     Thu Feb  8 23:29:47 2024
+++ pkgsrc/x11/xfce4-terminal/distinfo  Fri Feb 23 20:38:49 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.25 2024/02/08 23:29:47 gutteridge Exp $
+$NetBSD: distinfo,v 1.26 2024/02/23 20:38:49 gutteridge Exp $
 
 BLAKE2s (xfce4-terminal-1.1.2.tar.bz2) = b5da4916e955d68da41ee310f9427e776b0092e1098675f3b844f6140c69876b
 SHA512 (xfce4-terminal-1.1.2.tar.bz2) = ffd0975dc839e256ee18c8a5cb01025bfc2703af7d379d565ea861482269698c718c4cca408440cdc76ef7c6ccacaa6816da7f6734b1aef004cfb223f657243a
 Size (xfce4-terminal-1.1.2.tar.bz2) = 1042199 bytes
+SHA1 (patch-terminal_terminal-preferences-dialog.c) = 0f4966811d58e930c42c902642b7bcbb8c59545b

Added files:

Index: pkgsrc/x11/xfce4-terminal/patches/patch-terminal_terminal-preferences-dialog.c
diff -u /dev/null pkgsrc/x11/xfce4-terminal/patches/patch-terminal_terminal-preferences-dialog.c:1.1
--- /dev/null   Fri Feb 23 20:38:49 2024
+++ pkgsrc/x11/xfce4-terminal/patches/patch-terminal_terminal-preferences-dialog.c      Fri Feb 23 20:38:49 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-terminal_terminal-preferences-dialog.c,v 1.1 2024/02/23 20:38:49 gutteridge Exp $
+
+Fix regression with pasting multi-line data.
+https://gitlab.xfce.org/apps/xfce4-terminal/-/commit/71ecd2a721b059394edcfb316a20ac9d46a7b2cd
+
+--- terminal/terminal-preferences-dialog.c.orig        2024-01-23 19:10:59.000000000 +0000
++++ terminal/terminal-preferences-dialog.c
+@@ -1893,7 +1893,7 @@ terminal_preferences_dialog_presets_chan
+   GValue        src = { 0, };
+   GValue        dst = { 0, };
+ 
+-  g_return_if_fail (TERMINAL_IS_PREFERENCES_DIALOG (widget));
++  g_return_if_fail (TERMINAL_IS_PREFERENCES_DIALOG (dialog));
+   g_return_if_fail (GTK_IS_COMBO_BOX (widget));
+ 
+   combobox = GTK_COMBO_BOX (widget);