From cedc84102176756d042ece911dc7a2f752c5c6e8 Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owen@owenrafferty.com>
Date: Mon, 27 Jun 2022 13:06:19 -0500
Subject: [PATCH] gtk+3: fix atk patch

---
 extra/gtk+3/checksums                         |  2 +-
 extra/gtk+3/patches/03-no-accessibility.patch | 41 ++++---------------
 2 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/extra/gtk+3/checksums b/extra/gtk+3/checksums
index 8d38a8d3..a167237a 100644
--- a/extra/gtk+3/checksums
+++ b/extra/gtk+3/checksums
@@ -3,4 +3,4 @@ a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15
 69643e9bc1a0b794b0e8eb4dad2ae141bc5860b53689e4310dc4aaea15c2a888
 893f84833bf5b87a1b2f7d0a373f16037f5e2be6b4d030d8c4b7f9ff48cc993f
 8fbb449d4396cacba8c12b3e7461e1e940af8467e421a8011b3fa0bab0564426
-cc45270683573060c79dbff8e9eb0b15fa3754901bc79de6502ea4b825216ff9
+55ea6c6925741ba503875beb02b565349ec58dc0ecff119837fab9f2b2238502
diff --git a/extra/gtk+3/patches/03-no-accessibility.patch b/extra/gtk+3/patches/03-no-accessibility.patch
index c703a208..453444f9 100644
--- a/extra/gtk+3/patches/03-no-accessibility.patch
+++ b/extra/gtk+3/patches/03-no-accessibility.patch
@@ -4530,32 +4530,6 @@
                                      <signal name="button-press-event" handler="list_button_press_event_cb" swapped="no"/>
                                      <signal name="drag-data-received" handler="file_list_drag_data_received_cb" swapped="no"/>
                                      <signal name="drag-drop" handler="file_list_drag_drop_cb" swapped="no"/>
---- a/gtk/ui/gtkpathbar.ui
-+++ b/gtk/ui/gtkpathbar.ui
-@@ -6,11 +6,6 @@
-     <property name="can-focus">1</property>
-     <property name="receives-default">1</property>
-     <property name="focus-on-click">0</property>
--    <child internal-child="accessible">
--      <object class="AtkObject" id="down_slider_button-atkobject">
--        <property name="AtkObject::accessible-name" translatable="yes">Down Path</property>
--      </object>
--    </child>
-     <signal name="button-press-event" handler="gtk_path_bar_slider_button_press" swapped="no"/>
-     <signal name="button-release-event" handler="gtk_path_bar_slider_button_release" swapped="no"/>
-     <signal name="focus-out-event" handler="gtk_path_bar_slider_down_defocus" swapped="no"/>
-@@ -31,11 +26,6 @@
-     <property name="can-focus">1</property>
-     <property name="receives-default">1</property>
-     <property name="focus-on-click">0</property>
--    <child internal-child="accessible">
--      <object class="AtkObject" id="up_slider_button-atkobject">
--        <property name="AtkObject::accessible-name" translatable="yes">Up Path</property>
--      </object>
--    </child>
-     <signal name="button-press-event" handler="gtk_path_bar_slider_button_press" swapped="no"/>
-     <signal name="button-release-event" handler="gtk_path_bar_slider_button_release" swapped="no"/>
-     <signal name="focus-out-event" handler="gtk_path_bar_slider_up_defocus" swapped="no"/>
 --- a/gtk/ui/gtkprintunixdialog.ui
 +++ b/gtk/ui/gtkprintunixdialog.ui
 @@ -182,9 +182,6 @@
@@ -4577,9 +4551,9 @@
 -                                        <property name="AtkObject::accessible-name" translatable="yes">Pages</property>
 -                                        <property name="AtkObject::accessible-description" translatable="yes">Specify one or more page ranges,
 - e.g. 1–3, 7, 11</property>
-                                       </object>
+-                                      </object>
 -                                    </child>
--                                  </object>
+                                   </object>
                                    <packing>
                                      <property name="left-attach">1</property>
                                      <property name="top-attach">3</property>
@@ -4681,7 +4655,7 @@
                            </object>
                            <packing>
                              <property name="fill">0</property>
-@@ -1031,12 +991,6 @@
+@@ -1031,13 +991,6 @@
   e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
                                  <property name="invisible-char">•</property>
                                  <property name="invisible-char-set">1</property>
@@ -4691,10 +4665,11 @@
 -                                    <property name="AtkObject::accessible-description" translatable="yes">Specify the time of print,
 - e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
 -                                  </object>
-                                 </child>
+-                                </child>
                                  <signal name="changed" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
                                </object>
-@@ -1064,9 +1018,6 @@
+                               <packing>
+@@ -1064,9 +1017,6 @@
                                  <property name="width">2</property>
                                </packing>
                              </child>
@@ -4704,7 +4679,7 @@
                            </object>
                            <packing>
                              <property name="fill">0</property>
-@@ -1093,9 +1044,6 @@
+@@ -1093,9 +1043,6 @@
                              <attributes>
                                <attribute name="weight" value="bold"/>
                              </attributes>
@@ -4714,7 +4689,7 @@
                            </object>
                            <packing>
                              <property name="fill">0</property>
-@@ -1155,9 +1103,6 @@
+@@ -1155,9 +1102,6 @@
                                  <property name="top-attach">1</property>
                                </packing>
                              </child>