From 93f5dd7d5da7a2b70964ac39298e029cecf728a7 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Sun, 14 Jan 2018 21:26:09 +0700 Subject: [PATCH] regular.mk: update lxde, engineering flavours - switch browser from firefox to palemoon (firefox needed pulseaudio) - switch LXDE theme from upstream to lxdesktop (cf. ALT Engineering) - added qastool: ALSA mixer GUI - added qpdfview: PDF viewer (there was none) - update regular-engineering pkglist --- conf.d/mixin.mk | 3 ++- conf.d/regular.mk | 3 --- pkg.in/lists/tagged/desktop+lxde | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/conf.d/mixin.mk b/conf.d/mixin.mk index 28ce4c8b..4a5b980f 100644 --- a/conf.d/mixin.mk +++ b/conf.d/mixin.mk @@ -48,8 +48,9 @@ mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \ @$(call add,THE_PACKAGES,pnmixer pm-utils elinks mpg123) mixin/regular-lxde: use/x11/lxde use/fonts/infinality \ - use/x11/gtk/nm use/im +nm +alsa + use/x11/gtk/nm use/im use/browser/palemoon/i18n +nm +alsa @$(call add,LIVE_LISTS,$(call tags,desktop gvfs)) + @$(call add,THE_PACKAGES,qasmixer qpdfview) mixin/regular-tde: +tde \ use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 7a178545..e998969d 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -284,14 +284,11 @@ distro/regular-server-samba4: distro/.regular-server-managed @$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind) distro/regular-engineering: distro/regular-lxde use/live/ru - @$(call add,THE_PACKAGES,lxde-settings-lxdesktop) @$(call add,THE_LISTS,$(call tags,engineering desktop)) @$(call add,LIVE_LISTS,$(call tags,desktop sane)) @$(call add,THE_PACKAGES,LibreOffice LibreOffice-gnome LibreOffice-langpack-ru) - @$(call add,THE_PACKAGES,firefox-pepperflash) @$(call add,THE_PACKAGES,cups system-config-printer) @$(call add,THE_PACKAGES,gnome-disk-utility) - @$(call add,THE_PACKAGES,evince) @$(call add,LIVE_KMODULES,staging) @$(call add,DEFAULT_SERVICES_ENABLE,cups) @$(call add,DEFAULT_SERVICES_ENABLE,ModemManager) diff --git a/pkg.in/lists/tagged/desktop+lxde b/pkg.in/lists/tagged/desktop+lxde index 23cee3bc..f8dacfd4 100644 --- a/pkg.in/lists/tagged/desktop+lxde +++ b/pkg.in/lists/tagged/desktop+lxde @@ -20,7 +20,7 @@ menu-cache altlinux-freedesktop-menu-lxde # NB: an lxde-settings is required by lxde-common -lxde-settings-upstream +lxde-settings-lxdesktop lxde-icon-theme tango-icon-theme