regular.mk: switch lxqt, kde4, kde5 to falkon

The reason for all of them is simple: a modern webkit-based browser. The particular justification for each is: - lxqt: Qupzilla is officially deprecated in favour of Falkon; - kde4: Rekonq simply doesn't cut the mustard; - kde5: Firefox is fine but there's more suitable one.

regular.mk: switch lxqt, kde4, kde5 to falkon
1f82082c · Anton Midyukov · Michael Shigorin · d43fae17 · 1f82082c · 1f82082c
Commit 1f82082c authored Apr 11, 2018 by Anton Midyukov Committed by Michael Shigorin Apr 11, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

mixin.mk conf.d/mixin.mk +1 -1

regular.mk conf.d/regular.mk +3 -3

No files found.
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -59,7 +59,7 @@ mixin/regular-tde: +tde \
 	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)

 mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
-	use/browser/qupzilla use/x11/gtk/nm +nm +plymouth
+	use/browser/falkon use/x11/gtk/nm +nm +plymouth
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)

 # NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles

--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -172,7 +172,7 @@ distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
 	use/net-eth/dhcp use/efi/refind; @:

 distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
-	use/browser/konqueror4 use/fonts/zerg use/domain-client \
+	use/browser/falkon use/fonts/zerg use/domain-client \
 	use/net/nm/mmgui +pulse +plymouth
 	@$(call add,THE_LISTS,$(call tags,regular kde4))
 	@$(call add,THE_PACKAGES,fonts-ttf-levien-inconsolata)
@@ -184,11 +184,11 @@ distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @:
 distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
 	use/net-eth/dhcp use/efi/refind; @:

-distro/regular-kde5: distro/.regular-desktop \
+distro/regular-kde5: distro/.regular-desktop use/browser/falkon \
 	use/x11/kde5 use/x11/sddm use/domain-client \
 	use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
 	+nm +pulse +plymouth
-	@$(call add,THE_PACKAGES,kde5-telepathy)
+	@$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5)
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)

 distro/regular-rescue: distro/.regular-base mixin/regular-rescue  \