From 4cc852b4016d8aa1fa4d7a8b3911bebe1ed1da50 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Oct 2022 07:29:33 +0100 Subject: gentoo auto-resync : 08:10:2022 - 07:29:32 --- .../files/43.0-fwupd-Update-the-self-test.patch | 32 ++ ...rrect-release-information-to-pass-appstre.patch | 429 +++++++++++++++++++++ 2 files changed, 461 insertions(+) create mode 100644 gnome-extra/gnome-software/files/43.0-fwupd-Update-the-self-test.patch create mode 100644 gnome-extra/gnome-software/files/43.0-metainfo-Correct-release-information-to-pass-appstre.patch (limited to 'gnome-extra/gnome-software/files') diff --git a/gnome-extra/gnome-software/files/43.0-fwupd-Update-the-self-test.patch b/gnome-extra/gnome-software/files/43.0-fwupd-Update-the-self-test.patch new file mode 100644 index 000000000000..71c877a133bf --- /dev/null +++ b/gnome-extra/gnome-software/files/43.0-fwupd-Update-the-self-test.patch @@ -0,0 +1,32 @@ +From 14cf2c278d63863558e56bd68733b235a3490839 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Fri, 30 Sep 2022 11:23:35 +0200 +Subject: [PATCH] fwupd: Update the self test + +Depending on the fwupd version, an update detail differs, but the new +thing is that the change had been reverted for a newer version. + +Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1919 +--- + plugins/fwupd/gs-self-test.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/plugins/fwupd/gs-self-test.c b/plugins/fwupd/gs-self-test.c +index fe4bc5a2a..f02a9f0c2 100644 +--- a/plugins/fwupd/gs-self-test.c ++++ b/plugins/fwupd/gs-self-test.c +@@ -56,8 +56,9 @@ gs_plugins_fwupd_func (GsPluginLoader *plugin_loader) + g_assert_cmpstr (gs_app_get_description (app), ==, + "This is the first paragraph in the example " + "cab file.\n\nThis is the second paragraph."); +-#if FWUPD_CHECK_VERSION(1, 7, 1) +- /* Changes introduced in fwupd commit d3706e0e0b0fc210796da839b84ac391f7a251f8 */ ++#if FWUPD_CHECK_VERSION(1, 7, 1) && !FWUPD_CHECK_VERSION(1, 8, 0) ++ /* Changes introduced in fwupd commit d3706e0e0b0fc210796da839b84ac391f7a251f8 and ++ removed for 1.8.0 with https://github.com/fwupd/fwupd/commit/0eeaad76ec79562ea3790bb377d847d5be02182f */ + g_assert_cmpstr (gs_app_get_update_details_markup (app), ==, + "Some of the platform secrets may be invalidated when " + "updating this firmware. Please ensure you have the " +-- +2.35.1 + diff --git a/gnome-extra/gnome-software/files/43.0-metainfo-Correct-release-information-to-pass-appstre.patch b/gnome-extra/gnome-software/files/43.0-metainfo-Correct-release-information-to-pass-appstre.patch new file mode 100644 index 000000000000..7a5f81906848 --- /dev/null +++ b/gnome-extra/gnome-software/files/43.0-metainfo-Correct-release-information-to-pass-appstre.patch @@ -0,0 +1,429 @@ +From 165437bb8757cf138b8261f33467d200a5ddb6a6 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Fri, 30 Sep 2022 11:21:14 +0200 +Subject: [PATCH] metainfo: Correct release information to pass appstreamcli + validation + +Fix issues in org.gnome.Software.metainfo.xml.in reported by +appstreamcli 0.15.5 during validation. + +Also update the NEWS file, to match the new changes. + +Related to https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1919 +--- + NEWS | 24 +++---- + data/metainfo/meson.build | 2 +- + .../org.gnome.Software.metainfo.xml.in | 63 ++++++++++--------- + 3 files changed, 45 insertions(+), 44 deletions(-) + +diff --git a/NEWS b/NEWS +index 008cbd234..58f3ccd81 100644 +--- a/NEWS ++++ b/NEWS +@@ -22,7 +22,7 @@ This is a stable release with translation updates: + * Spanish + * Swedish + +-Version 43.rc ++Version 43~rc + ~~~~~~~~~~~~~ + Released: 2022-09-02 + +@@ -58,7 +58,7 @@ This release also updates translations: + * Turkish + * Ukrainian + +-Version 43.beta ++Version 43~beta + ~~~~~~~~~~~~~~~ + Released: 2022-08-05 + +@@ -87,7 +87,7 @@ This release also updates translations: + * Ukrainian + * Vietnamese + +-Version 43.alpha ++Version 43~alpha + ~~~~~~~~~~~~~~~~ + Released: 2022-06-30 + +@@ -181,7 +181,7 @@ This release also updates translations: + * Slovenian + * Swedish + +-Version 42.rc ++Version 42~rc + ~~~~~~~~~~~~~ + Released: 2022-03-04 + +@@ -217,7 +217,7 @@ This release also updates translations: + * Turkish + * Ukrainian + +-Version 42.beta ++Version 42~beta + ~~~~~~~~~~~~~~~ + Released: 2022-02-10 + +@@ -253,7 +253,7 @@ This release also updates translations: + * Spanish + * Ukrainian + +-Version 42.alpha ++Version 42~alpha + ~~~~~~~~~~~~~~~~ + Released: 2022-01-07 + +@@ -353,7 +353,7 @@ This release also updates translations: + * Swedish + * Ukrainian + +-Version 41.rc ++Version 41~rc + ~~~~~~~~~~~~~ + Released: 2021-09-07 + +@@ -385,7 +385,7 @@ This release also updates translations: + * Swedish + * Ukrainian + +-Version 41.beta ++Version 41~beta + ~~~~~~~~~~~~~~~ + Released: 2021-08-13 + +@@ -411,7 +411,7 @@ This release also updates translations: + * Slovenian + * Ukrainian + +-Version 41.alpha ++Version 41~alpha + ~~~~~~~~~~~~~~~~ + Released: 2021-07-20 + +@@ -481,7 +481,7 @@ Translation updates: + * Punjabi + * Serbian + +-Version 40.rc ++Version 40~rc + ~~~~~~~~~~~~~ + Released: 2021-03-12 + +@@ -522,7 +522,7 @@ Translation updates: + * Turkish + * Ukrainian + +-Version 40.beta ++Version 40~beta + ~~~~~~~~~~~~~~~ + Released: 2021-02-16 + +@@ -549,7 +549,7 @@ Translation updates: + * Spanish + * Swedish + +-Version 40.alpha ++Version 40~alpha + ~~~~~~~~~~~~~~~~ + Released: 2021-01-27 + +diff --git a/data/metainfo/meson.build b/data/metainfo/meson.build +index addc70a3c..2d056ffb6 100644 +--- a/data/metainfo/meson.build ++++ b/data/metainfo/meson.build +@@ -14,7 +14,7 @@ if get_option('tests') and appstream.version().version_compare('>=0.15.5') + args: ['validate', + '--pedantic', + '--no-net', +- '--override=releases-not-in-order=info', # 42.rc > 42.0 for AppStream, which clashes with GNOME versioning ++ '--explain', + 'org.gnome.Software.metainfo.xml.in'], + workdir : meson.current_source_dir(), + suite: ['lib'], +diff --git a/data/metainfo/org.gnome.Software.metainfo.xml.in b/data/metainfo/org.gnome.Software.metainfo.xml.in +index 581f922ff..7f5fd0484 100644 +--- a/data/metainfo/org.gnome.Software.metainfo.xml.in ++++ b/data/metainfo/org.gnome.Software.metainfo.xml.in +@@ -91,7 +91,7 @@ + + + +- ++ + +

This is the third unstable release for GNOME 43.

+
    +@@ -129,7 +129,7 @@ +
+ + +- ++ + +

This is the second unstable release for GNOME 43.

+
    +@@ -160,7 +160,7 @@ +
+ + +- ++ + +

This is the first unstable release for GNOME 43.

+
    +@@ -263,7 +263,7 @@ +
+ + +- ++ + +

This is the third unstable release for GNOME 42.

+
    +@@ -301,7 +301,7 @@ +
+ + +- ++ + +

This is the second unstable release for GNOME 42.

+
    +@@ -342,7 +342,7 @@ +
+ + +- ++ + +

This is the first unstable release for GNOME 42.

+
    +@@ -442,7 +442,7 @@ +
+ + +- ++ + +

This is the third unstable release for GNOME 41.

+
    +@@ -476,7 +476,7 @@ +
+ + +- ++ + +

This is the second unstable release for GNOME 41.

+
    +@@ -504,7 +504,7 @@ +
+ + +- ++ + +

This is the first unstable release for GNOME 41.

+
    +@@ -578,7 +578,7 @@ +
+ + +- ++ + +

This is an unstable release with the following changes:

+
    +@@ -621,7 +621,7 @@ +
+ + +- ++ + +

This is an unstable release with the following changes:

+
    +@@ -647,7 +647,7 @@ +
+ + +- ++ + +

This is the first unstable release for GNOME 40.

+
    +@@ -1759,7 +1759,7 @@ +

    This release also updates translations for many languages.

    + + +- ++ + +

    This is an unstable release in the 3.19 development series, with the following improvements:

    +
      +@@ -1782,7 +1782,7 @@ +

      This release also updates translations for many languages.

      + + +- ++ + +

      This stable release fixes the following bugs:

      +
        +@@ -1793,7 +1793,7 @@ +

        This release also updates translations for many languages.

        + + +- ++ + +

        This stable release fixes the following bugs:

        +
          +@@ -1803,7 +1803,7 @@ +

          This release also updates translations for many languages.

          + + +- ++ + +

          This stable release fixes the following bugs:

          +
            +@@ -1819,12 +1819,12 @@ +

            This release also updates translations for many languages.

            + + +- ++ + +

            This is the first stable release for the GNOME 3.18 desktop!

            +             +             +- ++ + +

            This is an unstable release in the 3.17 development series, with the following improvements:

            +
              +@@ -1835,7 +1835,7 @@ +

              This release also updates translations for many languages.

              + + +- ++ + +

              This is an unstable release in the 3.17 development series, with the following improvements:

              +
                +@@ -1848,7 +1848,7 @@ +

                This release also updates translations for many languages.

                + + +- ++ + +

                This is an unstable release with the following bugs fixed:

                +
                  +@@ -1858,7 +1858,7 @@ +

                  This release also updates translations for many languages.

                  + + +- ++ + +

                  This is an unstable release in the 3.17 development series, with the following improvements:

                  +
                    +@@ -1882,7 +1882,7 @@ +

                    This release also updates translations for many languages.

                    + + +- ++ + +

                    This is an unstable release in the 3.17 development series, with the following improvements:

                    +
                      +@@ -1899,7 +1899,7 @@ +

                      This release also updates translations for many languages.

                      + + +- ++ + +

                      This is the first unstable release in the 3.17 development series, with a number of new features:

                      +
                        +@@ -1914,7 +1914,7 @@ +

                        This release also updates translations for many languages.

                        + + +- ++ + +

                        This release fixes the following bugs:

                        +
                          +@@ -1928,7 +1928,7 @@ +

                          This release also updates translations for many languages.

                          + + +- ++ + +

                          This release fixes the following bugs:

                          +
                            +@@ -1938,12 +1938,12 @@ +

                            This release also updates translations for many languages.

                            + + +- ++ + +

                            This stable release marks the release of GNOME 3.16!

                            +                             +                             +- ++ + +

                            This unstable release adds the following features:

                            +
                              +@@ -1961,7 +1961,7 @@ +

                              This release also updates translations for many languages.

                              + + +- ++ + +

                              This unstable release adds the following features:

                              +
                                +@@ -1976,7 +1976,7 @@ +
                              +                               +                               +- ++ + +

                              This unstable release adds the following features:

                              +
                                +@@ -1990,7 +1990,7 @@ +
                              +                               +                               +- ++ + +

                              This unstable release adds the following features:

                              +
                                +@@ -2006,7 +2006,7 @@ +
                              +                               +                               +- ++ + +

                              This unstable release adds the following features:

                              +
                                +@@ -2063,4 +2063,5 @@ + none + none + ++ org.gnome.Software.desktop + +-- +2.35.1 + -- cgit v1.2.3