Drop combobox patch applied in new release

diff --git a/debian/patches/combobox-Avoid-extra-queue_resize.patch b/debian/patches/combobox-Avoid-extra-queue_resize.patch
deleted file mode 100644 (file)
index a3a8e6a..0000000
--- a/debian/patches/combobox-Avoid-extra-queue_resize.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Ivan Molodetskikh <yalterz@gmail.com>
-Date: Tue, 7 Mar 2023 09:51:32 -0800
-Subject: combobox: Avoid extra queue_resize()
-
-width-request already ensures it's above the minimum width, so avoid an
-extra queue_resize() when setting size request to (-1, -1).
-
-This is the same way as GtkDropDown works. This also unbreaks
-GtkComboBox after the recent allocation fix in
-75a417e33708dab2bdb2f784a8952e085a12bf03.
-
-Incidentally, this also makes GtkComboBox actually resize its popup as
-intended (that was broken before).
-
-I don't think this is ultimately the final fix, sometimes I still get
-allocation warnings. But the proper fix will probably involve changing
-some more allocation machinery around popovers. This is good enough for
-now.
-
-(cherry picked from commit 55faea104694599298a6ca1b9f2e7a1b46bad45a)
----
- gtk/deprecated/gtkcombobox.c | 14 ++------------
- 1 file changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/gtk/deprecated/gtkcombobox.c b/gtk/deprecated/gtkcombobox.c
-index 618f078..1e76b38 100644
---- a/gtk/deprecated/gtkcombobox.c
-+++ b/gtk/deprecated/gtkcombobox.c
-@@ -366,7 +366,6 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
- {
-   GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
-   GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box);
--  int menu_width;
- 
-   gtk_widget_size_allocate (priv->box,
-                             &(GtkAllocation) {
-@@ -374,17 +373,8 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
-                               width, height
-                             }, baseline);
- 
--  gtk_widget_set_size_request (priv->popup_widget, -1, -1);
--
--  if (priv->popup_fixed_width)
--    gtk_widget_measure (priv->popup_widget, GTK_ORIENTATION_HORIZONTAL, -1,
--                        &menu_width, NULL, NULL, NULL);
--  else
--    gtk_widget_measure (priv->popup_widget, GTK_ORIENTATION_HORIZONTAL, -1,
--                        NULL, &menu_width, NULL, NULL);
--
--  gtk_widget_set_size_request (priv->popup_widget,
--                               MAX (width, menu_width), -1);
-+  gtk_widget_set_size_request (priv->popup_widget, width, -1);
-+  gtk_widget_queue_resize (priv->popup_widget);
- 
-   gtk_popover_present (GTK_POPOVER (priv->popup_widget));
- }

diff --git a/debian/patches/series b/debian/patches/series
index 5725279277addba8e7d13a5a7893286f7831e755..a6870d4524064d034c7df1e187b0eacc52718225 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
 debian/reftests-Allow-minor-differences-to-be-tolerated.patch
 debian/Disable-inscription-markup.ui-reftest.patch
 debian/Disable-clipboard-test.patch
-combobox-Avoid-extra-queue_resize.patch