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 --- gnome-extra/Manifest.gz | Bin 11076 -> 11081 bytes gnome-extra/gnome-software/Manifest | 4 + .../files/43.0-fwupd-Update-the-self-test.patch | 32 ++ ...rrect-release-information-to-pass-appstre.patch | 429 +++++++++++++++++++++ .../gnome-software/gnome-software-43.0.ebuild | 107 +++++ 5 files changed, 572 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 create mode 100644 gnome-extra/gnome-software/gnome-software-43.0.ebuild (limited to 'gnome-extra') diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz index 381690e43ed8..eac6882325d4 100644 Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest index d5493f7d8eb5..7b9c9868aff6 100644 --- a/gnome-extra/gnome-software/Manifest +++ b/gnome-extra/gnome-software/Manifest @@ -1,3 +1,7 @@ +AUX 43.0-fwupd-Update-the-self-test.patch 1467 BLAKE2B 368b70c15ce19b67bf9625b9a6fa4768b4c26c919ce15024fdbc8fe26819973dbd404aacdab187d9afd573f9eac2f9e746de885042b40c9c81f8329ca0a98802 SHA512 b7f1a9910606f94ee532e2ab465d03eb30741fab38aae028c87df15dd0e431d8e10b68a3d50efa3e718feb3fec9ed1a45983826076b65f56881eb77cfd676bd9 +AUX 43.0-metainfo-Correct-release-information-to-pass-appstre.patch 14940 BLAKE2B 2692a3a648c6b20f3531a7e846e12ac09a9d59c86246cc4544624cb78cf7c48f568fbfaecc476e03ffc581e55389553e51ee01aef0920215f030dad5e080e4cb SHA512 5043f8b10c4f49f31ae065e326f861a83c1ae3862c21b8e7de312f04becdd75e282530df539f7320a689eb95266eb2b03c595dfeabd6b561c8e1648b1c679384 DIST gnome-software-42.4.tar.xz 2278412 BLAKE2B beb63ba7f874b72edd3c592f0a7553a4a5ba3631ede55da4c70989604cd0433dd40dd7c75b4bafdf106f1c02285e8502a610d8e2c9edf8cc4d34ea14f75fab62 SHA512 00c70886c6e3302a59ae533034d8d75cfe05873ea40d0d05a03e15ae34101bb8a64722a7c6a6d43bb54b61033bc14af1542bb832a70ee7b1a2dab6dacb8ffd8f +DIST gnome-software-43.0.tar.xz 2352976 BLAKE2B 8dc8b03c198aad01e73026ccb4b3e99888f39e9bbd99d9809863a2fe405865022a33458194f3769a3a5e9ff7a888beb463aca2805d90405342f9aae4485b352a SHA512 bcf64e4d3d847c660fd1c1a2356235569560bc315fb6b0d2e459dfb1bbee7bf97d9a14f7c8ef1129e01241385cd1540d1499f9cc9ad99a996965feb48e698d6a EBUILD gnome-software-42.4.ebuild 2800 BLAKE2B bf6d0e0f52184efe135c677289dcbaceb2a7adb7b326e0a6597dfe2e8c8aee38772a93a74cc421857a663686caac6ded75f374c07f0f900c186626cb3e641c9e SHA512 809ef0e439d4f0f908228fa4d5f71c479bd1114b2af4cee3e5f8ab67a2e3c0018441494ff56b57cd6f691acac5f4c859ee299ab70d2e5173df06a00171e363de +EBUILD gnome-software-43.0.ebuild 2783 BLAKE2B 23bfdc781acedca00698cc41ca76c0c32004427b6fa3ec00009c5e2d653b65887329bbcf3077196f20c5660ea3844c19b6e5bdf34c82c491830e24619e8d7339 SHA512 c85670858d264d1cb33df75b4fad441c909b9b99eade5bf4ff86bfc2ca19d6e5c3374b29aeba8f99803eeb49c7ab07f15c05077906fbea3ab0fd64f408b33aa4 MISC metadata.xml 579 BLAKE2B 4ac8aea21122da6a03605961d9f47721a06a4c49ffdc1ffa16eee5a473f5e5957c69760ee7d19e087688fe2b479a16f4cf417cbe0e2d3e149b0339881fecd2fc SHA512 3f783e0f7fbec5a95f498d622885de19babf8f786a66af2d3755907d242df0433a910b07c2628854ed1038920417d7d28c35c10f18adfcbd37e8922aa3c9253d 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 + diff --git a/gnome-extra/gnome-software/gnome-software-43.0.ebuild b/gnome-extra/gnome-software/gnome-software-43.0.ebuild new file mode 100644 index 000000000000..1e9273245cf0 --- /dev/null +++ b/gnome-extra/gnome-software/gnome-software-43.0.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson virtualx xdg + +DESCRIPTION="Gnome install & update software" +HOMEPAGE="https://wiki.gnome.org/Apps/Software https://gitlab.gnome.org/GNOME/gnome-software" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="flatpak +firmware gnome gtk-doc sysprof udev test" + +RDEPEND=" + >=dev-libs/appstream-0.14.0:0= + >=x11-libs/gdk-pixbuf-2.32.0:2 + >=dev-libs/libxmlb-0.1.7:= + >=gui-libs/gtk-4.6:4 + >=dev-libs/glib-2.70.0:2 + >=dev-libs/json-glib-1.6.0 + >=net-libs/libsoup-3.0:3.0 + >=gui-libs/libadwaita-1.0.1:1 + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) + gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) + sys-auth/polkit + firmware? ( >=sys-apps/fwupd-1.5.6 ) + flatpak? ( + >=sys-apps/flatpak-1.9.1 + dev-util/ostree + ) + udev? ( dev-libs/libgudev ) + >=gnome-base/gsettings-desktop-schemas-3.11.5 +" +DEPEND="${RDEPEND} + test? ( dev-libs/libglib-testing ) +" +BDEPEND=" + dev-libs/libxml2:2 + dev-util/gdbus-codegen + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.3 + ) +" + +PATCHES=( + "${FILESDIR}"/${PV}-metainfo-Correct-release-information-to-pass-appstre.patch + "${FILESDIR}"/${PV}-fwupd-Update-the-self-test.patch +) + +src_prepare() { + default + xdg_environment_reset + + sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die + # We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled) + sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die +} + +src_configure() { + local emesonargs=( + $(meson_use test tests) + $(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings. + -Dman=true + -Dpackagekit=false + # -Dpackagekit_autoremove + -Dpolkit=true + -Deos_updater=false # Endless OS updater + $(meson_use firmware fwupd) + $(meson_use flatpak) + -Dmalcontent=false + -Drpm_ostree=false + -Dwebapps=true + -Dhardcoded_foss_webapps=true + -Dhardcoded_proprietary_webapps=true + $(meson_use udev gudev) + -Dapt=false + -Dsnap=false + -Dexternal_appstream=false + $(meson_use gtk-doc gtk_doc) + -Dhardcoded_curated=true + -Ddefault_featured_apps=false # TODO: Will this be beneficial to us with flatpak at least? If enabled, it shows some apps under installed (probably merely due to /usr/share/app-info presence), but launching and removal of them is broken + -Dmogwai=false #TODO? + $(meson_feature sysprof) + -Dprofile='' + -Dsoup2=false + ) + meson_src_configure +} + +src_test() { + virtx dbus-run-session meson test -C "${BUILD_DIR}" || die +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} -- cgit v1.2.3