diff --git a/helpers/DATA/software-properties/remove_livepatch_from_gtk_ui.patch b/helpers/DATA/software-properties/remove_livepatch_from_gtk_uiv1_1.patch similarity index 85% rename from helpers/DATA/software-properties/remove_livepatch_from_gtk_ui.patch rename to helpers/DATA/software-properties/remove_livepatch_from_gtk_uiv1_1.patch index 23200e0..f570474 100644 --- a/helpers/DATA/software-properties/remove_livepatch_from_gtk_ui.patch +++ b/helpers/DATA/software-properties/remove_livepatch_from_gtk_uiv1_1.patch @@ -1,6 +1,7 @@ ---- data/gtkbuilder/main.ui 2019-09-08 00:59:05.221188984 -0700 -+++ data/gtkbuilder/main.ui 2019-09-08 00:56:52.294542817 -0700 -@@ -1116,231 +1116,6 @@ +diff -Nru software-properties-0.99.9.8/data/gtkbuilder/main.ui software-properties-0.99.9.8_new/data/gtkbuilder/main.ui +--- software-properties-0.99.9.8/data/gtkbuilder/main.ui 2021-10-26 07:27:56.000000000 -0500 ++++ software-properties-0.99.9.8_new/data/gtkbuilder/main.ui 2021-11-15 21:32:20.534728294 -0600 +@@ -1241,256 +1241,6 @@ False @@ -12,6 +13,35 @@ - vertical - 12 - +- +- True +- True +- +- +- +- True +- vertical +- +- +- True +- <b>Preview: Ubuntu Pro for Desktop</b>. Automatic security updates to over 30,000 open source software packages. +- True +- 0 +- +- +- +- +- True +- <a href="http://ubuntu.com/advantage">Join the beta programme</a>. +- True +- 0 +- +- +- +- +- +- +- - - True - False @@ -24,7 +54,6 @@ - - False - True -- 0 - - - @@ -81,7 +110,6 @@ - - False - True -- 1 - - - @@ -193,7 +221,6 @@ - - True - True -- 2 - - - @@ -210,7 +237,6 @@ - False - True - end -- 3 - - - diff --git a/helpers/make-software-properties b/helpers/make-software-properties index 6b1b092..58de892 100644 --- a/helpers/make-software-properties +++ b/helpers/make-software-properties @@ -49,6 +49,9 @@ cat << EOF | patch -p1 debsrc_line = debsrc_entry_type + deb_line[3:] EOF +patch -p1 < $DATA/remove_livepatch_from_gtk_uiv1_1.patch +patch -p1 < $DATA/disable-livepatch.patch + sed '/UbuntuDrivers/d' -i softwareproperties/gtk/SoftwarePropertiesGtk.py sed '/vbox_drivers/,+1 s/True/False/' -i data/gtkbuilder/main.ui @@ -69,8 +72,6 @@ rm -rf tests sed '/gir1.2-snapd-1/d' -i debian/control sed '/self.init_livepatch/d' -i softwareproperties/gtk/SoftwarePropertiesGtk.py -patch -p0 < $DATA/remove_livepatch_from_gtk_ui.patch -patch -p1 < $DATA/disable-livepatch.patch sed 's/status = self.get_status()/status = Snapd.SnapStatus.UNKNOWN/' -i softwareproperties/LivepatchSnap.py rm data/software-properties-drivers.desktop.in