From 9e5ed1454aa9af99ae9c066ddbbf8ed1e94b3a2d Mon Sep 17 00:00:00 2001 From: itsmanjeet Date: Wed, 15 May 2024 18:13:39 +0200 Subject: [PATCH] xfce4-settings as system app --- elements/components/meta-xfce4.yml | 1 + elements/{apps => components/xfce4}/xfce4-settings.yml | 8 ++++---- elements/system/pre-installed.yml | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) rename elements/{apps => components/xfce4}/xfce4-settings.yml (98%) diff --git a/elements/components/meta-xfce4.yml b/elements/components/meta-xfce4.yml index 50421071..f2fce96e 100644 --- a/elements/components/meta-xfce4.yml +++ b/elements/components/meta-xfce4.yml @@ -10,5 +10,6 @@ depends: - components/xfce4/xfconf.yml - components/xfce4/xfdesktop.yml - components/xfce4/xfwm4.yml + - components/xfce4/xfce4-settings.yml merge: [elements/include/meta.inc] diff --git a/elements/apps/xfce4-settings.yml b/elements/components/xfce4/xfce4-settings.yml similarity index 98% rename from elements/apps/xfce4-settings.yml rename to elements/components/xfce4/xfce4-settings.yml index be57a989..84f0e060 100644 --- a/elements/apps/xfce4-settings.yml +++ b/elements/components/xfce4/xfce4-settings.yml @@ -57,7 +57,7 @@ prepare-appimage: |- EOF -build-depends: +depends: - components/xfce4/exo.yml - components/xfce4/garcon.yml - components/xfce4/xfconf.yml @@ -68,10 +68,10 @@ build-depends: - components/libinput.yml - components/upower.yml - components/themes/adwaita-icon-theme.yml - - components/intltool.yml - components/x11/xf86-input-libinput.yml +build-depends: + - components/intltool.yml + sources: - https://archive.xfce.org/src/xfce/xfce4-settings/%{version:2}/xfce4-settings-%{version}.tar.bz2 - -merge: [elements/include/appimage.inc] diff --git a/elements/system/pre-installed.yml b/elements/system/pre-installed.yml index 316b3784..11ef8b86 100644 --- a/elements/system/pre-installed.yml +++ b/elements/system/pre-installed.yml @@ -7,7 +7,6 @@ build-depends: - apps/initial-setup.yml - apps/thunar.yml - apps/xfce4-terminal.yml - - apps/xfce4-settings.yml - apps/mousepad.yml script: |-