pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/gtk2
Module Name: pkgsrc
Committed By: tsutsui
Date: Mon Feb 26 15:05:21 UTC 2024
Modified Files:
pkgsrc/x11/gtk2: Makefile distinfo
Added Files:
pkgsrc/x11/gtk2/patches: patch-gtk_gtkfilechooserdefault.c
patch-gtk_gtkfilesystemmodel.c patch-gtk_gtkpathbar.c
Log Message:
gtk2: pull patches from GIMP to avoid error messages with recent GLib.
This appeases the following tons of GLib-GIO-CRITICAL error messages on
GIMP's file open dialogs:
>> file ../gio/gfileinfo.c: line 1633 (g_file_info_get_is_hidden): should not be reached
>> file ../gio/gfileinfo.c: line 1655 (g_file_info_get_is_backup): should not be reached
See the following issue for details:
https://gitlab.gnome.org/GNOME/gimp/-/issues/9994
https://gitlab.gnome.org/GNOME/gimp/-/commit/024e3c7
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.338 -r1.339 pkgsrc/x11/gtk2/Makefile
cvs rdiff -u -r1.168 -r1.169 pkgsrc/x11/gtk2/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/x11/gtk2/patches/patch-gtk_gtkfilechooserdefault.c \
pkgsrc/x11/gtk2/patches/patch-gtk_gtkfilesystemmodel.c \
pkgsrc/x11/gtk2/patches/patch-gtk_gtkpathbar.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/Makefile
diff -u pkgsrc/x11/gtk2/Makefile:1.338 pkgsrc/x11/gtk2/Makefile:1.339
--- pkgsrc/x11/gtk2/Makefile:1.338 Tue Nov 14 14:03:09 2023
+++ pkgsrc/x11/gtk2/Makefile Mon Feb 26 15:05:21 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.338 2023/11/14 14:03:09 wiz Exp $
+# $NetBSD: Makefile,v 1.339 2024/02/26 15:05:21 tsutsui Exp $
DISTNAME= gtk+-2.24.33
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/2.24/}
EXTRACT_SUFX= .tar.xz
Index: pkgsrc/x11/gtk2/distinfo
diff -u pkgsrc/x11/gtk2/distinfo:1.168 pkgsrc/x11/gtk2/distinfo:1.169
--- pkgsrc/x11/gtk2/distinfo:1.168 Tue Oct 26 11:33:51 2021
+++ pkgsrc/x11/gtk2/distinfo Mon Feb 26 15:05:21 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.168 2021/10/26 11:33:51 nia Exp $
+$NetBSD: distinfo,v 1.169 2024/02/26 15:05:21 tsutsui Exp $
BLAKE2s (gtk+-2.24.33.tar.xz) = 358ff13c5e021a4634bc5944474c0818181d56cff55473d911a4afb42d5d81fb
SHA512 (gtk+-2.24.33.tar.xz) = 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
@@ -6,5 +6,8 @@ Size (gtk+-2.24.33.tar.xz) = 12661828 by
SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad
SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3
+SHA1 (patch-gtk_gtkfilechooserdefault.c) = f690f3a8c3066e49e8184fb096f5dd74e5a93f33
+SHA1 (patch-gtk_gtkfilesystemmodel.c) = 656c86055976aec356a50b4e1b7d12ac2b1c877e
+SHA1 (patch-gtk_gtkpathbar.c) = 7e5c4186bd9533cb096f5331e3eb7193222b47b3
SHA1 (patch-gtk_gtksearchenginesimple.c) = 3c44b84f2e0d3f7cdfb594bf56370f588d165b14
SHA1 (patch-gtk_gtktooltips.c) = 94f384b4becd74a9effcdbb72bbe3ee9a58d2bb8
Added files:
Index: pkgsrc/x11/gtk2/patches/patch-gtk_gtkfilechooserdefault.c
diff -u /dev/null pkgsrc/x11/gtk2/patches/patch-gtk_gtkfilechooserdefault.c:1.1
--- /dev/null Mon Feb 26 15:05:21 2024
+++ pkgsrc/x11/gtk2/patches/patch-gtk_gtkfilechooserdefault.c Mon Feb 26 15:05:21 2024
@@ -0,0 +1,23 @@
+$NetBSD: patch-gtk_gtkfilechooserdefault.c,v 1.1 2024/02/26 15:05:21 tsutsui Exp $
+
+- pull fixes to avoid gimp errors with recent GLib.
+ https://gitlab.gnome.org/GNOME/gimp/-/issues/9994
+ https://gitlab.gnome.org/GNOME/gimp/-/commit/024e3c7495bc3f33cf53410c4997201c3f1ab760
+
+--- gtk/gtkfilechooserdefault.c.orig 2020-12-18 05:50:58.000000000 +0000
++++ gtk/gtkfilechooserdefault.c
+@@ -6378,10 +6378,12 @@ show_and_select_files (GtkFileChooserDef
+ if (!_gtk_file_system_model_iter_is_visible (fsmodel, &iter))
+ {
+ GFileInfo *info = _gtk_file_system_model_get_info (fsmodel, &iter);
++ gboolean has_is_hidden = g_file_info_has_attribute (info, "standard::is-hidden");
++ gboolean has_is_backup = g_file_info_has_attribute (info, "standard::is-backup");
+
+ if (!enabled_hidden &&
+- (g_file_info_get_is_hidden (info) ||
+- g_file_info_get_is_backup (info)))
++ ((has_is_hidden && g_file_info_get_is_hidden (info)) ||
++ (has_is_backup && g_file_info_get_is_backup (info))))
+ {
+ g_object_set (impl, "show-hidden", TRUE, NULL);
+ enabled_hidden = TRUE;
Index: pkgsrc/x11/gtk2/patches/patch-gtk_gtkfilesystemmodel.c
diff -u /dev/null pkgsrc/x11/gtk2/patches/patch-gtk_gtkfilesystemmodel.c:1.1
--- /dev/null Mon Feb 26 15:05:21 2024
+++ pkgsrc/x11/gtk2/patches/patch-gtk_gtkfilesystemmodel.c Mon Feb 26 15:05:21 2024
@@ -0,0 +1,33 @@
+$NetBSD: patch-gtk_gtkfilesystemmodel.c,v 1.1 2024/02/26 15:05:21 tsutsui Exp $
+
+- pull fixes to avoid gimp errors with recent GLib.
+ https://gitlab.gnome.org/GNOME/gimp/-/issues/9994
+ https://gitlab.gnome.org/GNOME/gimp/-/commit/024e3c7495bc3f33cf53410c4997201c3f1ab760
+
+--- gtk/gtkfilesystemmodel.c.orig 2020-12-18 05:29:40.000000000 +0000
++++ gtk/gtkfilesystemmodel.c
+@@ -444,16 +444,22 @@ static gboolean
+ node_should_be_visible (GtkFileSystemModel *model, guint id, gboolean filtered_out)
+ {
+ FileModelNode *node = get_node (model, id);
++ gboolean has_is_hidden, has_is_backup;
+ gboolean result;
+
+ if (node->info == NULL)
+ return FALSE;
+
++ has_is_hidden = g_file_info_has_attribute (node->info, "standard::is-hidden");
++ has_is_backup = g_file_info_has_attribute (node->info, "standard::is-backup");
++
+ if (!model->show_hidden &&
+- (g_file_info_get_is_hidden (node->info) || g_file_info_get_is_backup (node->info)))
++ ((has_is_hidden && g_file_info_get_is_hidden (node->info)) ||
++ (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;
Index: pkgsrc/x11/gtk2/patches/patch-gtk_gtkpathbar.c
diff -u /dev/null pkgsrc/x11/gtk2/patches/patch-gtk_gtkpathbar.c:1.1
--- /dev/null Mon Feb 26 15:05:21 2024
+++ pkgsrc/x11/gtk2/patches/patch-gtk_gtkpathbar.c Mon Feb 26 15:05:21 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-gtk_gtkpathbar.c,v 1.1 2024/02/26 15:05:21 tsutsui Exp $
+
+- pull fixes to avoid gimp errors with recent GLib.
+ https://gitlab.gnome.org/GNOME/gimp/-/issues/9994
+ https://gitlab.gnome.org/GNOME/gimp/-/commit/024e3c7495bc3f33cf53410c4997201c3f1ab760
+
+--- gtk/gtkpathbar.c.orig 2020-12-18 05:29:40.000000000 +0000
++++ gtk/gtkpathbar.c
+@@ -1659,7 +1659,8 @@ gtk_path_bar_get_info_callback (GCancell
+ }
+
+ display_name = g_file_info_get_display_name (info);
+- is_hidden = g_file_info_get_is_hidden (info) || g_file_info_get_is_backup (info);
++ is_hidden = g_file_info_get_attribute_boolean (info, "standard::is-hidden") ||
++ g_file_info_get_attribute_boolean (info, "standard::is-backup");
+
+ gtk_widget_push_composite_child ();
+ button_data = make_directory_button (file_info->path_bar, display_name,
Home |
Main Index |
Thread Index |
Old Index