Attachment #8137 for bug #36769

View | Details | Raw Unified | Return to bug 36769
Collapse All | Expand All

Lines 152-158 distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \ Link Here

(-)a/conf.d/regular.mk (-1 lines)
152	@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)	152	@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
153	@$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates)	153	@$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates)
154	@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)	154	@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)
155	@$(call add,DEFAULT_SERVICES_ENABLE,gdm)
156		155
157	distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \	156	distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \
158	use/browser/falkon	157	use/browser/falkon

Lines 74-89 use/x11/wacom: use/x11 Link Here

(-)a/features.in/x11/config.mk (-2 / +9 lines)
74	use/x11/dm: use/x11-autostart	74	use/x11/dm: use/x11-autostart
75	@$(call try,THE_DISPLAY_MANAGER,xdm)	75	@$(call try,THE_DISPLAY_MANAGER,xdm)
76	@$(call add,THE_PACKAGES,$$(THE_DISPLAY_MANAGER))	76	@$(call add,THE_PACKAGES,$$(THE_DISPLAY_MANAGER))
		77	@$(call try,THE_DM_SERVICE,dm)
		78	@$(call add,DEFAULT_SERVICES_ENABLE,$$(THE_DM_SERVICE))
77		79
78	use/x11/lightdm/gtk use/x11/lightdm/slick \	80	use/x11/lightdm/gtk use/x11/lightdm/slick \
79	use/x11/lightdm/qt use/x11/lightdm/lxqt use/x11/lightdm/kde: \	81	use/x11/lightdm/qt use/x11/lightdm/lxqt use/x11/lightdm/kde: \
80	use/x11/lightdm/%: use/x11/dm	82	use/x11/lightdm/%: use/x11/dm
81	@$(call set,THE_DISPLAY_MANAGER,lightdm-$*-greeter)	83	@$(call set,THE_DISPLAY_MANAGER,lightdm-$*-greeter)
		84	@$(call set,THE_DM_SERVICE,lightdm)
82		85
83	use/x11/sddm use/x11/lxdm use/x11/gdm2.20 use/x11/gdm: \	86	use/x11/lxdm use/x11/gdm2.20 use/x11/sddm: \
84	use/x11/%: use/x11/dm	87	use/x11/%: use/x11/dm
85	@$(call set,THE_DISPLAY_MANAGER,$*)	88	@$(call set,THE_DISPLAY_MANAGER,$*)
86		89
		90	use/x11/gdm: \
		91	use/x11/%: use/x11/dm
		92	@$(call set,THE_DISPLAY_MANAGER,$*)
		93	@$(call set,THE_DM_SERVICE,$*)
		94
87	use/x11/xdm: use/x11/dm	95	use/x11/xdm: use/x11/dm
88	@$(call set,THE_DISPLAY_MANAGER,xdm)	96	@$(call set,THE_DISPLAY_MANAGER,xdm)
89	@$(call add,THE_PACKAGES,installer-feature-no-xconsole-stage3)	97	@$(call add,THE_PACKAGES,installer-feature-no-xconsole-stage3)
90	-

Return to bug 36769