diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index fc2bece8bd..e367620e8a 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -46,10 +46,11 @@ jobs: options: --cap-add=SYS_ADMIN --privileged steps: - uses: terrapkg/anda-build@main + if: github.event_name != 'pull_request' with: name: "${{ matrix.pkg.pkg }}" mockConfig: anda-${{ matrix.version }}-${{ matrix.pkg.arch }} - extraArgs: ${{ github.event_name != 'pull_request' && '-D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"' || "" }} + extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}" andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo - name: Generating artifact name @@ -72,6 +73,9 @@ jobs: --token ${{ secrets.SUBATOMIC_TOKEN }} \ terra${{ matrix.version }} anda-build/rpm/rpms/* - - name: Notify Madoguchi - if: always() - run: ./.github/workflows/mg.sh ${{success()}} ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} + - name: Notify Madoguchi (Success) + if: success() + run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} + - name: Notify Madoguchi (Failure) + if: !success() + run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c26fed215..5adfbf812e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,6 +42,9 @@ jobs: --token ${{ secrets.SUBATOMIC_TOKEN }} \ terra${{ matrix.version }} anda-build/rpm/rpms/* - - name: Notify Madoguchi - if: always() - run: ./.github/workflows/mg.sh ${{success()}} ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} + - name: Notify Madoguchi (Success) + if: success() + run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} + - name: Notify Madoguchi (Failure) + if: !success() + run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} diff --git a/anda/desktops/elementary/elementary-files/elementary-files.spec b/anda/desktops/elementary/elementary-files/elementary-files.spec index ad2bd69f53..554c1bac04 100644 --- a/anda/desktops/elementary/elementary-files/elementary-files.spec +++ b/anda/desktops/elementary/elementary-files/elementary-files.spec @@ -5,7 +5,7 @@ Name: elementary-files Summary: File manager from elementary -Version: 6.3.0 +Version: 6.3.1 Release: 1%{?dist} License: GPL-3.0 diff --git a/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec b/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec index 1ffdb4e0f4..0970fb4dfa 100644 --- a/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec +++ b/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec @@ -3,8 +3,8 @@ Name: elementary-sideload Summary: Sideload flatpaks on Pantheon -Version: 6.1.0 -Release: %autorelease +Version: 6.2.0 +Release: 1%{?dist} License: GPL-3.0-or-later URL: https://github.com/elementary/sideload @@ -48,7 +48,7 @@ desktop-file-validate \ %{buildroot}/%{_datadir}/applications/%{appname}.desktop appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml %files -f %{appname}.lang @@ -60,7 +60,7 @@ appstream-util validate-relax --nonet \ %{_datadir}/applications/%{appname}.desktop %{_datadir}/icons/hicolor/*/apps/%{appname}.svg %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml -%{_datadir}/metainfo/%{appname}.appdata.xml +%{_datadir}/metainfo/%{appname}.metainfo.xml %changelog diff --git a/anda/desktops/elementary/elementary-terminal/00-drop-upstream-tests.patch b/anda/desktops/elementary/elementary-terminal/00-drop-upstream-tests.patch deleted file mode 100644 index 3b11261ba1..0000000000 --- a/anda/desktops/elementary/elementary-terminal/00-drop-upstream-tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/data/meson.build b/data/meson.build -index 435b841..321d7fb 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -32,18 +32,6 @@ i18n.merge_file ( - po_dir: join_paths(meson.source_root (), 'po', 'extra') - ) - --test ( -- 'Validate desktop file', -- find_program('desktop-file-validate'), -- args: join_paths(meson.current_build_dir (), meson.project_name() + '.desktop') --) -- --test ( -- 'Validate open here desktop file', -- find_program('desktop-file-validate'), -- args: join_paths(meson.current_build_dir (), 'open-pantheon-terminal-here.desktop') --) -- - install_data( - 'pantheon_terminal_process_completion_notifications.fish', - install_dir: join_paths(get_option('datadir'), 'fish', 'vendor_conf.d') diff --git a/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec b/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec index ef1b61538f..7f733ec770 100644 --- a/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec +++ b/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec @@ -3,16 +3,13 @@ Name: elementary-terminal Summary: The terminal of the 21st century -Version: 6.1.1 +Version: 6.1.2 Release: 1%{?dist} License: LGPL-3.0 URL: https://github.com/elementary/%{srcname} Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz -# drop upstream tests that only validate .desktop and appdata files -Patch0: 00-drop-upstream-tests.patch - BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libappstream-glib diff --git a/anda/desktops/elementary/gala/gala.spec b/anda/desktops/elementary/gala/gala.spec index b79f96c654..fe179b0ebb 100644 --- a/anda/desktops/elementary/gala/gala.spec +++ b/anda/desktops/elementary/gala/gala.spec @@ -2,7 +2,7 @@ Name: gala Summary: Gala window manager -Version: 7.0.1 +Version: 7.0.2 Release: 1%{?dist} License: GPL-3.0-or-later diff --git a/anda/desktops/elementary/switchboard-plug-onlineaccounts/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch b/anda/desktops/elementary/switchboard-plug-onlineaccounts/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch deleted file mode 100644 index ecbe624b23..0000000000 --- a/anda/desktops/elementary/switchboard-plug-onlineaccounts/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch +++ /dev/null @@ -1,94 +0,0 @@ -From b60f0458a23a2f76ad14d399f145e150e1ab82d3 Mon Sep 17 00:00:00 2001 -From: Bobby Rong -Date: Sat, 23 Jul 2022 10:45:28 +0800 -Subject: [PATCH] build: support evolution-data-server 3.45 - ---- - meson.build | 3 +++ - src/Dialogs/CaldavDialog.vala | 23 +++++++++++++++++++++++ - 2 files changed, 26 insertions(+) - -diff --git a/meson.build b/meson.build -index 61fa00b5..72387657 100644 ---- a/meson.build -+++ b/meson.build -@@ -44,6 +44,9 @@ switchboard_dep = dependency('switchboard-2.0') - if edataserverui_dep.version().version_compare('>=3.39.2') - add_project_arguments('--define=HAS_EDS_3_40', language: 'vala') - endif -+if edataserverui_dep.version().version_compare('>=3.45.1') -+ add_project_arguments('--define=HAS_EDS_3_46', language: 'vala') -+endif - - gresource = gnome.compile_resources( - 'gresource', -diff --git a/src/Dialogs/CaldavDialog.vala b/src/Dialogs/CaldavDialog.vala -index b658b266..c6c934b2 100644 ---- a/src/Dialogs/CaldavDialog.vala -+++ b/src/Dialogs/CaldavDialog.vala -@@ -397,7 +397,11 @@ public class OnlineAccounts.CaldavDialog : Hdy.Window { - col.backend_name = "caldav"; - - unowned var webdav = (E.SourceWebdav)source.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND); -+#if HAS_EDS_3_46 -+ webdav.uri = GLib.Uri.parse (url_entry.text, GLib.UriFlags.NONE); -+#else - webdav.soup_uri = new Soup.URI (url_entry.text); -+#endif - webdav.calendar_auto_schedule = true; - - unowned var auth = (E.SourceAuthentication)source.get_extension (E.SOURCE_EXTENSION_AUTHENTICATION); -@@ -473,7 +477,11 @@ public class OnlineAccounts.CaldavDialog : Hdy.Window { - string? webdav_host = null; - if (source.has_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND)) { - unowned var webdav_extension = (E.SourceWebdav) source.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND); -+#if HAS_EDS_3_46 -+ webdav_host = webdav_extension.uri.get_host (); -+#else - webdav_host = webdav_extension.soup_uri.host; -+#endif - } - - foreach (unowned E.WebDAVDiscoveredSource? disc_source in discovered_sources) { -@@ -486,7 +494,11 @@ public class OnlineAccounts.CaldavDialog : Hdy.Window { - }; - - unowned var webdav = (E.SourceWebdav) e_source.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND); -+#if HAS_EDS_3_46 -+ webdav.uri = GLib.Uri.parse (disc_source.href, GLib.UriFlags.NONE); -+#else - webdav.soup_uri = new Soup.URI (disc_source.href); -+#endif - webdav.color = disc_source.color; - - switch (only_supports) { -@@ -550,10 +562,17 @@ public class OnlineAccounts.CaldavDialog : Hdy.Window { - - if (collection_source.has_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND)) { - unowned var webdav_extension = (E.SourceWebdav) collection_source.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND); -+#if HAS_EDS_3_46 -+ url_entry.text = webdav_extension.uri.to_string (); -+ -+ if (webdav_extension.uri.get_user () != null && webdav_extension.uri.get_user () != "") { -+ url_entry.text = url_entry.text.replace (webdav_extension.uri.get_user () + "@", ""); -+#else - url_entry.text = webdav_extension.soup_uri.to_string (false); - - if (webdav_extension.soup_uri.user != null && webdav_extension.soup_uri.user != "") { - url_entry.text = url_entry.text.replace (webdav_extension.soup_uri.user + "@", ""); -+#endif - } - } - -@@ -589,7 +608,11 @@ public class OnlineAccounts.CaldavDialog : Hdy.Window { - authentication_extension.user = username_entry.text; - - unowned var webdav_extension = (E.SourceWebdav) collection_source.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND); -+#if HAS_EDS_3_46 -+ webdav_extension.uri = GLib.Uri.parse (url_entry.text, GLib.UriFlags.NONE); -+#else - webdav_extension.soup_uri = new Soup.URI (url_entry.text); -+#endif - webdav_extension.calendar_auto_schedule = true; - - unowned var offline_extension = (E.SourceOffline) collection_source.get_extension (E.SOURCE_EXTENSION_OFFLINE); diff --git a/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec b/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec index dc3a8ad616..9e6ed1dc28 100644 --- a/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec +++ b/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec @@ -6,7 +6,7 @@ Name: switchboard-plug-onlineaccounts Summary: Switchboard Online Accounts plug -Version: 6.5.1 +Version: 6.5.2 Release: 1%{?dist} License: GPL-3.0-or-later @@ -18,8 +18,6 @@ BuildRequires: libappstream-glib BuildRequires: meson BuildRequires: vala -Patch0: b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch - BuildRequires: pkgconfig(camel-1.2) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) @@ -71,8 +69,8 @@ appstream-util validate-relax --nonet \ %changelog -* Thu Nov 17 2022 windowsboy111 - 6.5.1-1 -- new version +* Thu Nov 17 2022 windowsboy111 - 6.5.1-1 +- New version * Sat Oct 15 2022 windowsboy111 - Repackaged for Terra diff --git a/anda/desktops/lomiri/lomiri.spec b/anda/desktops/lomiri/lomiri.spec index e0ea69952a..35de24c195 100644 --- a/anda/desktops/lomiri/lomiri.spec +++ b/anda/desktops/lomiri/lomiri.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri -%global commit c6f7dc9dc556cd003144be79259a6fe71cc09a55 +%global commit 49d67f32d4710ce5fb9597fe52b97b6c152d5b4f %forgemeta Name: lomiri @@ -65,6 +65,8 @@ Requires: lomiri-ui-toolkit Requires: lomiri-download-manager Requires: suru-icon-theme Requires: lomiri-schemas +# For some reason Lomiri `/usr/bin/lomiri` requires it for testability +Requires: %{name}-tests%{?_isa} = %{version}-%{release} %description Lomiri, Previously Unity8 is a convergent desktop environment built with Qt. @@ -96,10 +98,18 @@ The %{name}-tests package contains test files for %{name}. #cd tests/autopilot && python setup.py install %find_lang %{name} +mkdir -m 0755 -p %{buildroot}%{_sysconfdir}/lomiri %{buildroot}%{_sysconfdir}/lomirisensors +install -Dm644 data/devices.conf %{buildroot}%{_sysconfdir}/lomiri +install -Dm644 data/test.sensors %{buildroot}%{_sysconfdir}/lomirisensors + %ldconfig_scriptlets %files -f %{name}.lang %license COPYING COPYING.LGPL +%dir %{_sysconfdir}/lomiri +%{_sysconfdir}/lomiri/devices.conf +%dir %{_sysconfdir}/lomirisensors +%{_sysconfdir}/lomirisensors/test.sensors %{_bindir}/indicators-client %{_bindir}/lomiri %{_userunitdir}/*.service diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index bafc72c5c1..503e72e13b 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: osu-lazer -Version: 2023.326.1 +Version: 2023.403.1 Release: 1%{?dist} Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 610a7a23c6..d142a86de0 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit 09d607f39c47a467de5dde260e90771ad0ac51df +%global commit 0a9081cb878044ec70f40f46082a23c5e821b101 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index 579c467ba9..1e5dc6fd2b 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit 09d607f39c47a467de5dde260e90771ad0ac51df +%global commit 0a9081cb878044ec70f40f46082a23c5e821b101 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 diff --git a/anda/libayatana-common/anda.hcl b/anda/lib/libayatana-common/anda.hcl similarity index 100% rename from anda/libayatana-common/anda.hcl rename to anda/lib/libayatana-common/anda.hcl diff --git a/anda/libayatana-common/libayatana-common.spec b/anda/lib/libayatana-common/libayatana-common.spec similarity index 100% rename from anda/libayatana-common/libayatana-common.spec rename to anda/lib/libayatana-common/libayatana-common.spec diff --git a/anda/lib/qtdbusmock/qtdbusmock.spec b/anda/lib/qtdbusmock/qtdbusmock.spec index ff1e4904eb..552fa2af19 100644 --- a/anda/lib/qtdbusmock/qtdbusmock.spec +++ b/anda/lib/qtdbusmock/qtdbusmock.spec @@ -17,6 +17,7 @@ BuildRequires: pkgconfig(libqtdbustest-1) BuildRequires: pkgconfig(libnm) BuildRequires: pkgconfig(gmock) BuildRequires: pkgconfig(gtest) +Requires: qt5-qtdbustest %description A simple library for mocking DBus services with a Qt API. diff --git a/anda/lib/qtmir/qtmir.spec b/anda/lib/qtmir/qtmir.spec index f8f9eed9ba..f55f15dfd6 100644 --- a/anda/lib/qtmir/qtmir.spec +++ b/anda/lib/qtmir/qtmir.spec @@ -54,6 +54,7 @@ BuildRequires: qt5-qtdeclarative-devel BuildRequires: glm-devel BuildRequires: boost-devel +Requires: process-cpp Requires: xorg-x11-server-Xwayland %description diff --git a/anda/others/lomiri-session/anda.hcl b/anda/others/lomiri-session/anda.hcl index 7f84a8142d..d82c3e755f 100644 --- a/anda/others/lomiri-session/anda.hcl +++ b/anda/others/lomiri-session/anda.hcl @@ -1,5 +1,5 @@ project "pkg" { rpm { - spec = "lomiri-desktop-session.spec" + spec = "lomiri-session.spec" } } diff --git a/anda/others/sass/sass.spec b/anda/others/sass/sass.spec index ccf8a66953..e3cf844ce6 100644 --- a/anda/others/sass/sass.spec +++ b/anda/others/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.60.0 +Version: 1.61.0 Release: 1%{?dist} Summary: The reference implementation of Sass, written in Dart License: MIT diff --git a/anda/others/ubuntu-sdk/ubuntu-sdk.spec b/anda/others/ubuntu-sdk/ubuntu-sdk.spec index a9dbde760f..713e59928b 100644 --- a/anda/others/ubuntu-sdk/ubuntu-sdk.spec +++ b/anda/others/ubuntu-sdk/ubuntu-sdk.spec @@ -30,8 +30,8 @@ mkdir -m 0755 -p %{buildroot}%{_datadir}/ubports/changelogs %{buildroot}%{_datad install -Dm644 changelogs/* %{buildroot}%{_datadir}/ubports/changelogs install -Dm644 frameworks/* %{buildroot}%{_datadir}/click/frameworks -ln -s %{buildroot}%{_datadir}/click/frameworks/ubuntu-sdk-%{version}.framework %{buildroot}%{_datadir}/click/frameworks/current -ln -s %{buildroot}%{_datadir}/ubports/changelogs/%{version} %{buildroot}%{_datadir}/ubports/changelogs/current +ln -s %{_datadir}/click/frameworks/ubuntu-sdk-%{version}.framework %{buildroot}%{_datadir}/click/frameworks/current +ln -s %{_datadir}/ubports/changelogs/%{version} %{buildroot}%{_datadir}/ubports/changelogs/current %files %license COPYING diff --git a/anda/python/ruff/python3-ruff.spec b/anda/python/ruff/python3-ruff.spec index 861a3cf57b..10ee6c2d56 100644 --- a/anda/python/ruff/python3-ruff.spec +++ b/anda/python/ruff/python3-ruff.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: python3-ruff -Version: 0.0.260 +Version: 0.0.261 Release: 1%{?dist} Summary: An extremely fast Python linter, written in Rust License: MIT diff --git a/anda/rust/maturin/rust-maturin.spec b/anda/rust/maturin/rust-maturin.spec index 34b8879ea6..5de1b894b9 100644 --- a/anda/rust/maturin/rust-maturin.spec +++ b/anda/rust/maturin/rust-maturin.spec @@ -2,7 +2,7 @@ %global crate maturin Name: rust-maturin -Version: 0.14.16 +Version: 0.14.17 Release: 1%{?dist} Summary: Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages