regular.mk, regular+kde4: rosa-imagewriter use extended

It's been proposed to add an image writing tool to all of the desktop regular builds (which is reasonable). rosa-imagewriter depends on qt5 that's currently found in lxqt, kde4 and kde5 flavours only so let's put it there. imagewriter (the openSUSE's original one) goes to the rest of DE builds: xdg-su would fallback to gksu if none of the desktops got "detected", and that means several more megabytes of crap (completely unneeded in WM-based images I think).

regular.mk, regular+kde4: rosa-imagewriter use extended
efa2b9c8 · Michael Shigorin · 58254f05 · efa2b9c8 · efa2b9c8
Commit efa2b9c8 authored Dec 04, 2015 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

regular.mk conf.d/regular.mk +5 -0

regular+kde4 pkg.in/lists/tagged/regular+kde4 +0 -1

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -24,6 +24,8 @@ mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs
 	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
 	@$(call add,THE_PACKAGES,alterator-notes)
 	@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
+	@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
+	@$(call set,THE_IMAGEWRITER,imagewriter)
 # WM base target
 distro/.regular-wm: distro/.regular-x11 mixin/regular-desktop
@@ -175,11 +177,13 @@ distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
 	use/net/nm/mmgui +pulse +plymouth
 	@$(call add,THE_LISTS,$(call tags,regular kde4))
 	@$(call add,THE_PACKAGES,volumes-profile-lite)
+	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 	@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)
 mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
 	use/net/connman use/browser/qupzilla +plymouth
 	@$(call add,THE_PACKAGES,qconnman-ui)
+	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @:
@@ -196,6 +200,7 @@ distro/regular-kde5: distro/.regular-desktop \
 	use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
 	+nm +pulse +plymouth
 	@$(call add,THE_PACKAGES,kde5-telepathy)
+	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 # NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
 #     kernel cmdline resulting in method:disk instead of method:cdrom

--- a/pkg.in/lists/tagged/regular+kde4
+++ b/pkg.in/lists/tagged/regular+kde4
@@ -14,4 +14,3 @@ altlinux-freedesktop-menu-kde4
 altlinux-freedesktop-menu-shallow-menu
 quick-usb-formatter
-rosa-imagewriter