CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

software-properties: backport v111 for improved deb822 sources

Browse source
This commit is contained in:
Luis Guzmán 2025-09-26 14:37:13 -06:00
parent ba94845cbc
commit 63f1a0f061
7 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

126
helpers/DATA/software-properties/patch_changes/002-remove_proposed_updates.patch Normal file
View file

@ -0,0 +1,126 @@
diff -Nru software-properties-0.99.22.5+11.0trisquel11/data/gtkbuilder/main.ui software-properties-0.99.22.5+11.0trisquel11_fix/data/gtkbuilder/main.ui
--- software-properties-0.99.22.5+11.0trisquel11/data/gtkbuilder/main.ui 2023-01-27 09:12:26.635563930 -0600
+++ software-properties-0.99.22.5+11.0trisquel11_fix/data/gtkbuilder/main.ui 2023-01-27 09:21:43.497166997 -0600
@@ -1157,70 +1157,6 @@
<property name="tab_fill">False</property>
</packing>
</child>
- <child>
- <object class="GtkBox" id="dev_options">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">12</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkFrame" id="frame_children1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkBox" id="dev_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label_updates1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Use proposed updates if you’re willing to report bugs on any problems that occur.</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="max_width_chars">110</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">5</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">Trisquel Pro</property>
- </object>
- <packing>
- <property name="position">6</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">True</property>
diff -Nru software-properties-0.99.22.5+11.0trisquel11/softwareproperties/gtk/SoftwarePropertiesGtk.py software-properties-0.99.22.5+11.0trisquel11_fix/softwareproperties/gtk/SoftwarePropertiesGtk.py
--- software-properties-0.99.22.5+11.0trisquel11/softwareproperties/gtk/SoftwarePropertiesGtk.py 2023-01-27 09:54:48.314903324 -0600
+++ software-properties-0.99.22.5+11.0trisquel11_fix/softwareproperties/gtk/SoftwarePropertiesGtk.py 2023-01-27 10:15:52.589232983 -0600
@@ -410,24 +410,6 @@
self.vbox_dist_comps.add(checkbox)
checkbox.show()
- # Setup the checkbuttons for the child repos
- for checkbutton in self.dev_box.get_children():
- self.dev_box.remove(checkbutton)
- for template in self.distro.source_template.children:
- # Do not show source entries in there
- if template.type == "deb-src":
- continue
- if "proposed" in template.name:
- checkbox = Gtk.CheckButton(label="%s (%s)" % (template.description,
- template.name))
- checkbox.template = template
- self.handlers[checkbox] = \
- checkbox.connect("toggled",
- self.on_checkbutton_child_toggled,
- template)
- self.dev_box.add(checkbox)
- checkbox.show()
-
status = get_ua_status()
if not is_current_distro_lts():
esm_available = False
@@ -510,12 +492,6 @@
"""Fill the distro user interface with life"""
self.block_handlers()
- # Enable or disable the child source checkbuttons
- for checkbox in self.dev_box.get_children():
- (active, inconsistent) = self.get_comp_child_state(checkbox.template)
- checkbox.set_active(active)
- checkbox.set_inconsistent(inconsistent)
-
# Enable or disable the component checkbuttons
for checkbox in self.vbox_dist_comps.get_children():
# check if the comp is enabled
@@ -562,10 +538,8 @@
# and source code
if len(self.distro.enabled_comps) < 1:
self.combobox_updates_subscription.set_sensitive(False)
- self.dev_box.set_sensitive(False)
self.checkbutton_source_code.set_sensitive(False)
else:
- self.dev_box.set_sensitive(True)
self.checkbutton_source_code.set_sensitive(True)
# Check for source code sources