gtk3-3.24.51

2026-02-08 08:27:38 +04:00
parent f2fd48fc42
commit 5347fa05e6
3 changed files with 16 additions and 128 deletions
@@ -1,28 +0,0 @@
-From 4c220ef6650afeba334570ad00db0a95c9ba38e6 Mon Sep 17 00:00:00 2001
-From: Michael Biebl <biebl@debian.org>
-Date: Tue, 17 Apr 2012 13:29:09 +0200
-Subject: [PATCH] Fix installation of HTML images for absolute paths
-
-when using out-of-tree builds.
-
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=674163
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656803
---
- gtk-doc.make |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: gtk+-3.6.4/gtk-doc.make
-===================================================================
--- gtk+-3.6.4.orig/gtk-doc.make	2013-01-10 16:03:56.697595578 +1300
-+++ gtk+-3.6.4/gtk-doc.make	2013-01-10 16:03:56.693595578 +1300
-@@ -173,8 +173,8 @@
- 	  if test -f $(abs_srcdir)/$$file ; then \
- 	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
- 	  fi; \
-	  if test -f $(abs_builddir)/$$file ; then \
-	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
-+	  if test -f $$file ; then \
-+	    cp $$file $(abs_builddir)/html; \
- 	  fi; \
- 	done;
- 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
@@ -1,76 +0,0 @@
-Description: "ubuntu-almost-fixed-height" private property to speed-up software-center
-Bug: https://bugzilla.gnome.org/607447
-Bug-Ubuntu: https://launchpad.net/bugs/514879
-
-=== modified file 'gtk/gtktreeview.c'
-Index: gtk+-3.6.4/gtk/gtktreeview.c
-===================================================================
--- gtk+-3.6.4.orig/gtk/gtktreeview.c	2013-01-10 16:03:58.421595565 +1300
-+++ gtk+-3.6.4/gtk/gtktreeview.c	2013-01-10 16:03:58.417595565 +1300
-@@ -462,6 +462,7 @@
- 
-   guint fixed_height_mode : 1;
-   guint fixed_height_check : 1;
-+  guint ubuntu_almost_fixed_height_mode : 1;
- 
-   guint reorderable : 1;
-   guint header_has_focus : 1;
-@@ -552,6 +553,7 @@
-   PROP_ENABLE_SEARCH,
-   PROP_SEARCH_COLUMN,
-   PROP_FIXED_HEIGHT_MODE,
-+  PROP_UBUNTU_ALMOST_FIXED_HEIGHT_MODE,
-   PROP_HOVER_SELECTION,
-   PROP_HOVER_EXPAND,
-   PROP_SHOW_EXPANDERS,
-@@ -1075,6 +1077,15 @@
-                                                            P_("Speeds up GtkTreeView by assuming that all rows have the same height"),
-                                                            FALSE,
-                                                            GTK_PARAM_READWRITE));
-+
-+    /* Private ubuntu extension to fix bugzilla bug #607447 */
-+    g_object_class_install_property (o_class,
-+                                     PROP_UBUNTU_ALMOST_FIXED_HEIGHT_MODE,
-+                                     g_param_spec_boolean ("ubuntu-almost-fixed-height-mode",
-+                                                           "Private Ubuntu extension",
-+							   "Private Ubuntu extension",
-+                                                           FALSE,
-+                                                           GTK_PARAM_READWRITE));
-     
-     /**
-      * GtkTreeView:hover-selection:
-@@ -1736,6 +1747,7 @@
-   tree_view->priv->fixed_height = -1;
-   tree_view->priv->fixed_height_mode = FALSE;
-   tree_view->priv->fixed_height_check = 0;
-+  tree_view->priv->ubuntu_almost_fixed_height_mode = FALSE;
-   tree_view->priv->selection = _gtk_tree_selection_new_with_tree_view (tree_view);
-   tree_view->priv->enable_search = TRUE;
-   tree_view->priv->search_column = -1;
-@@ -1828,6 +1840,9 @@
-     case PROP_FIXED_HEIGHT_MODE:
-       gtk_tree_view_set_fixed_height_mode (tree_view, g_value_get_boolean (value));
-       break;
-+    case PROP_UBUNTU_ALMOST_FIXED_HEIGHT_MODE:
-+      tree_view->priv->ubuntu_almost_fixed_height_mode = g_value_get_boolean (value);
-+      break;
-     case PROP_HOVER_SELECTION:
-       tree_view->priv->hover_selection = g_value_get_boolean (value);
-       break;
-@@ -8740,7 +8755,15 @@
- 
-   _gtk_tree_view_accessible_changed (tree_view, tree, node);
- 
-  if (tree_view->priv->fixed_height_mode
-+  if (tree_view->priv->ubuntu_almost_fixed_height_mode
-+      && tree_view->priv->fixed_height >= 0)
-+    {
-+      _gtk_rbtree_node_mark_invalid (tree, node);
-+      validate_visible_area (tree_view);
-+      if (gtk_widget_get_realized (GTK_WIDGET (tree_view)))
-+	gtk_tree_view_node_queue_redraw (tree_view, tree, node);
-+    }
-+  else if (tree_view->priv->fixed_height_mode
-       && tree_view->priv->fixed_height >= 0)
-     {
-       _gtk_rbtree_node_set_height (tree, node, tree_view->priv->fixed_height);