From 41cef1269ef29d3c48e830d0292e98e903d3412b Mon Sep 17 00:00:00 2001 From: madonuko Date: Sun, 28 Jul 2024 01:56:18 +0800 Subject: [PATCH 1/3] fix: switchboard-plug-locale --- .../switchboard-plug-locale.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec b/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec index 897c1bb092..5e4bd4e384 100644 --- a/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec +++ b/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec @@ -4,7 +4,7 @@ %global plug_type personal %global plug_name locale -%global plug_rdnn io.elementary.switchboard.locale +%global plug_rdnn io.elementary.settings.locale Name: switchboard-plug-locale Summary: Switchboard Locale Plug @@ -23,9 +23,9 @@ BuildRequires: fdupes BuildRequires: pkgconfig(accountsservice) BuildRequires: pkgconfig(ibus-1.0) -BuildRequires: pkgconfig(gnome-desktop-3.0) -BuildRequires: pkgconfig(granite) -BuildRequires: polkit-devel +#BuildRequires: pkgconfig(gnome-desktop-3.0) +#BuildRequires: pkgconfig(granite) +#BuildRequires: polkit-devel BuildRequires: switchboard-devel Requires: switchboard%?_isa @@ -46,7 +46,7 @@ Supplements: switchboard%?_isa %install %meson_install %fdupes %buildroot%_datadir/locale/ -%find_lang %plug_name-plug +%find_lang %plug_rdnn %check @@ -54,13 +54,13 @@ appstream-util validate-relax --nonet \ %buildroot/%_datadir/metainfo/%plug_rdnn.appdata.xml -%files -f %plug_name-plug.lang +%files -f %plug_rdnn.lang %doc README.md %license COPYING -%_libdir/switchboard/%plug_type/lib%plug_name-plug.so -%_libdir/switchboard/personal/pantheon-locale/languagelist -%_libdir/switchboard/personal/pantheon-locale/packages_blacklist +%_libdir/switchboard-3/%plug_type/lib%plug_rdnn.so +%_libdir/switchboard-3/%plug_type/pantheon-locale/languagelist +%_libdir/switchboard-3/%plug_type/pantheon-locale/packages_blocklist %_datadir/glib-2.0/schemas/%plug_rdnn.gschema.xml %_datadir/polkit-1/actions/%plug_rdnn.policy From 2faef4aa29afc60a90285a0ebfbf3b128fbb4e26 Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 28 Jul 2024 02:00:44 +0800 Subject: [PATCH 2/3] gnome-desktop-4 Signed-off-by: madomado --- .../switchboard-plug-locale/switchboard-plug-locale.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec b/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec index 5e4bd4e384..8a71d7b0c5 100644 --- a/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec +++ b/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec @@ -23,7 +23,7 @@ BuildRequires: fdupes BuildRequires: pkgconfig(accountsservice) BuildRequires: pkgconfig(ibus-1.0) -#BuildRequires: pkgconfig(gnome-desktop-3.0) +BuildRequires: pkgconfig(gnome-desktop-4) #BuildRequires: pkgconfig(granite) #BuildRequires: polkit-devel BuildRequires: switchboard-devel From 1605fdb4e3e223be2f734d0183a8503ba3988b1c Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 28 Jul 2024 02:03:54 +0800 Subject: [PATCH 3/3] Update switchboard-plug-locale.spec Signed-off-by: madomado --- .../switchboard-plug-locale/switchboard-plug-locale.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec b/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec index 8a71d7b0c5..77f46861c1 100644 --- a/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec +++ b/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec @@ -24,8 +24,6 @@ BuildRequires: fdupes BuildRequires: pkgconfig(accountsservice) BuildRequires: pkgconfig(ibus-1.0) BuildRequires: pkgconfig(gnome-desktop-4) -#BuildRequires: pkgconfig(granite) -#BuildRequires: polkit-devel BuildRequires: switchboard-devel Requires: switchboard%?_isa