CVS commit: pkgsrc/x11/gtk2

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Tue Feb 27 14:50:50 UTC 2024

Modified Files:
        pkgsrc/x11/gtk2: distinfo
        pkgsrc/x11/gtk2/patches: patch-gtk_gtkfilesystemmodel.c

Log Message:
gtk2: remove unnecessary diff lines.


To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 pkgsrc/x11/gtk2/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/gtk2/patches/patch-gtk_gtkfilesystemmodel.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/gtk2/distinfo
diff -u pkgsrc/x11/gtk2/distinfo:1.169 pkgsrc/x11/gtk2/distinfo:1.170
--- pkgsrc/x11/gtk2/distinfo:1.169      Mon Feb 26 15:05:21 2024
+++ pkgsrc/x11/gtk2/distinfo    Tue Feb 27 14:50:50 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.169 2024/02/26 15:05:21 tsutsui Exp $
+$NetBSD: distinfo,v 1.170 2024/02/27 14:50:50 tsutsui Exp $
 
 BLAKE2s (gtk+-2.24.33.tar.xz) = 358ff13c5e021a4634bc5944474c0818181d56cff55473d911a4afb42d5d81fb
 SHA512 (gtk+-2.24.33.tar.xz) = 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
@@ -7,7 +7,7 @@ SHA1 (patch-ab) = 9c82cc60f3825d377a197c
 SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad
 SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3
 SHA1 (patch-gtk_gtkfilechooserdefault.c) = f690f3a8c3066e49e8184fb096f5dd74e5a93f33
-SHA1 (patch-gtk_gtkfilesystemmodel.c) = 656c86055976aec356a50b4e1b7d12ac2b1c877e
+SHA1 (patch-gtk_gtkfilesystemmodel.c) = 5a70efa956be67b8d9b4a5b79147003988c4befd
 SHA1 (patch-gtk_gtkpathbar.c) = 7e5c4186bd9533cb096f5331e3eb7193222b47b3
 SHA1 (patch-gtk_gtksearchenginesimple.c) = 3c44b84f2e0d3f7cdfb594bf56370f588d165b14
 SHA1 (patch-gtk_gtktooltips.c) = 94f384b4becd74a9effcdbb72bbe3ee9a58d2bb8

Index: pkgsrc/x11/gtk2/patches/patch-gtk_gtkfilesystemmodel.c
diff -u pkgsrc/x11/gtk2/patches/patch-gtk_gtkfilesystemmodel.c:1.1 pkgsrc/x11/gtk2/patches/patch-gtk_gtkfilesystemmodel.c:1.2
--- pkgsrc/x11/gtk2/patches/patch-gtk_gtkfilesystemmodel.c:1.1  Mon Feb 26 15:05:21 2024
+++ pkgsrc/x11/gtk2/patches/patch-gtk_gtkfilesystemmodel.c      Tue Feb 27 14:50:50 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-gtk_gtkfilesystemmodel.c,v 1.1 2024/02/26 15:05:21 tsutsui Exp $
+$NetBSD: patch-gtk_gtkfilesystemmodel.c,v 1.2 2024/02/27 14:50:50 tsutsui Exp $
 
 - pull fixes to avoid gimp errors with recent GLib.
  https://gitlab.gnome.org/GNOME/gimp/-/issues/9994
@@ -6,7 +6,7 @@ $NetBSD: patch-gtk_gtkfilesystemmodel.c,
 
 --- gtk/gtkfilesystemmodel.c.orig      2020-12-18 05:29:40.000000000 +0000
 +++ gtk/gtkfilesystemmodel.c
-@@ -444,16 +444,22 @@ static gboolean
+@@ -444,13 +444,18 @@ static gboolean
  node_should_be_visible (GtkFileSystemModel *model, guint id, gboolean filtered_out)
  {
    FileModelNode *node = get_node (model, id);
@@ -25,9 +25,4 @@ $NetBSD: patch-gtk_gtkfilesystemmodel.c,
 +       (has_is_backup && g_file_info_get_is_backup (node->info))))
      return FALSE;
  
--  if (_gtk_file_info_consider_as_directory (node->info))
-+   if (_gtk_file_info_consider_as_directory (node->info))
-+
-     {
-       if (!model->show_folders)
-         return FALSE;
+   if (_gtk_file_info_consider_as_directory (node->info))