From ec4f3826e4769b17bbe55413a226424984fd2033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Wed, 9 Apr 2025 05:41:42 +0000
Subject: [PATCH] software-properties: update patch removing subscription tab.

---
 ...ab.patch => remove_ubuntu_subscription_tab.patch} | 12 ++++++++----
 helpers/make-software-properties                     |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)
 rename helpers/DATA/software-properties/{remove_ubuntu_suscription_tab.patch => remove_ubuntu_subscription_tab.patch} (97%)

diff --git a/helpers/DATA/software-properties/remove_ubuntu_suscription_tab.patch b/helpers/DATA/software-properties/remove_ubuntu_subscription_tab.patch
similarity index 97%
rename from helpers/DATA/software-properties/remove_ubuntu_suscription_tab.patch
rename to helpers/DATA/software-properties/remove_ubuntu_subscription_tab.patch
index 413fc95..2c4dfaa 100644
--- a/helpers/DATA/software-properties/remove_ubuntu_suscription_tab.patch
+++ b/helpers/DATA/software-properties/remove_ubuntu_subscription_tab.patch
@@ -1,8 +1,8 @@
 diff --git a/data/gtkbuilder/main.ui b/data/gtkbuilder/main.ui
-index fe0a50f0..2943052f 100644
+index 01aa294e..9734153f 100644
 --- a/data/gtkbuilder/main.ui
 +++ b/data/gtkbuilder/main.ui
-@@ -1210,423 +1210,6 @@
+@@ -1225,427 +1225,6 @@
                  <property name="position">5</property>
                </packing>
              </child>
@@ -272,7 +272,7 @@ index fe0a50f0..2943052f 100644
 -                                <property name="orientation">vertical</property>
 -                                <property name="spacing">12</property>
 -                                <child>
--                                  <object class="GtkLabel">
+-                                  <object class="GtkLabel" id="label_compliance_and_hardening">
 -                                    <property name="visible">True</property>
 -                                    <property name="label" translatable="yes">&lt;b&gt;Compliance &amp;amp; Hardening&lt;/b&gt;</property>
 -                                    <property name="use_markup">True</property>
@@ -280,7 +280,7 @@ index fe0a50f0..2943052f 100644
 -                                  </object>
 -                                </child>
 -                                <child>
--                                  <object class="GtkLabel">
+-                                  <object class="GtkLabel" id="label_compliance_and_hardening_subtitle">
 -                                    <property name="visible">True</property>
 -                                    <property name="label" translatable="yes">Only recommended to assist with FedRAMP, HIPAA, and other compliance and hardening requirements. Includes FIPS 140-2 certified modules, DISA-STIG, CIS and Common Criteria.</property>
 -                                    <property name="wrap">True</property>
@@ -385,6 +385,10 @@ index fe0a50f0..2943052f 100644
 -                                </child>
 -                              </object>
 -                            </child>
+-                            <accessibility>
+-                              <relation type="labelled-by" target="label_compliance_and_hardening_subtitle"/>
+-                              <relation type="labelled-by" target="label_compliance_and_hardening"/>
+-                            </accessibility>
 -                          </object>
 -                        </child>
 -                      </object>
diff --git a/helpers/make-software-properties b/helpers/make-software-properties
index 8eae4a5..653a35d 100644
--- a/helpers/make-software-properties
+++ b/helpers/make-software-properties
@@ -76,7 +76,7 @@ patch_p1 $DATA/rm_init_ubuntu_pro_if_lts.patch
 sed -i '/.TrisquelProPage/d' softwareproperties/gtk/SoftwarePropertiesGtk.py
 
 #Livepatch - aramo
-patch_p1 $DATA/remove_ubuntu_suscription_tab.patch
+patch_p1 $DATA/remove_ubuntu_subscription_tab.patch
 patch_p1 $DATA/remove_proposed_updates.patch
 #Patch codename for PPAs
 patch_p1 $DATA/fix_PPA_upstream_codename.patch