Remove conflicts.HEADmaster

1 files changed, 0 insertions, 627 deletions

diff --git a/blfs/KDE.Makefile b/blfs/KDE.Makefile
index 7b79bd5..dc2681c 100644
--- a/blfs/KDE.Makefile
+++ b/blfs/KDE.Makefile
@@ -416,630 +416,3 @@ Xorg_Synaptics_Driver : # libevdev Xorg-Server
 

 XviD : # yasm or NASM

 	@echo $@

-=======
-# Most deps like GLib, Xorg, gobject-introspection brought in from
-# Systemd-Extras and Xorg in main and Xorg Makefiles and not listed 
-# here or commented in targets
-#
-# Deps which can use QT5 after systemd extra and Xorg and QT5
-# Rebuild the following:
-# wpa_supplicant cairo doxygen cmake graphviz
-# suggest waiting for cairo and graphviz for later
-
-kde = extra-cmake-modules ffmpeg phonon-backend-gstreamer \
-	  phonon-backend-vlc polkit-qt libdbusmenu-qt \
-	  plasma-wayland-protocols kf5-pre-install-config \
-	  kf5 Ark Kdenlive KMix Khelpcenter Konsole libkexiv2 \
-	  Okular libkdcraw Gwenview libkcddb K3b plasma5 Konversation \
-	  Falkon K3b-qt5webkit Kmail kmail-account-wizard kaccounts-providers \
-	  kdepim-addons kwave Kate Dolphin KCalc \
-	  # Other apps to install may be viewed at https://apps.kde.org/
-
-all: Systemd-Extras $(kde)
-
-akonadi : kaccounts-integration kf5
-	@echo $@
-
-akonadi-calendar : kf5 grantleetheme
-	@echo $@
-
-akonadi-contact : grantleetheme libkleo
-	@echo $@
-
-akonadi-import-wizard : akonadi-contact
-	@echo $@
-
-akonadi-mime : akonadi kmime
-	@echo $@
-
-akonadi-notes : kf5 kmime
-	@echo $@
-
-akonadi-search : kf5
-	@echo $@
-
-Ark : cpio p7zip UnRar kf5 libarchive unzip Zip
-	@echo $@
-
-Aspell : which
-	@echo $@
-
-atkmm : glibmm ATK
-	@echo $@
-
-AudioFile :
-	@echo $@
-
-baloo-widgets : kf5
-	@echo $@
-
-breeze-icons : extra-cmake-modules kf5 libxml2 lxml
-	@echo $@
-
-c-ares : CMake
-	@echo $@
-
-calendarsupport : akonadi-notes
-	@echo $@
-
-Cdrdao : gtkmm libao libmad libvorbis LAME
-	@echo $@
-
-Cdrtools : alsa-lib
-	@echo $@
-
-clisp :
-	@echo $@
-
-cpio :
-	@echo $@
-
-dhcp :
-	@echo $@ "(client only)"
-
-Discount :
-	@echo $@
-
-Dolphin : baloo-widgets # packagekit-qt
-	@echo $@
-
-dvd-rw-tools : Cdrtools
-	@echo $@
-
-dosfstools :
-	@echo $@
-
-eventviews : akonadi-calendar kmime calendarsupport
-	@echo $@
-
-extra-cmake-modules : CMake
-	@echo $@
-
-Exiv2 : CMake cURL Doxygen Graphviz libxslt
-	@echo $@
-
-FAAC :
-	@echo $@
-
-FAAD2 :
-	@echo $@
-
-Falkon : extra-cmake-modules qtwebengine kf5
-	@echo $@
-
-fdk-aac :
-	@echo $@
-
-ffmpeg : libass fdk-aac x264 x265 frei0r-plugins libcdio opencv OpenJPEG \
-	Samba XviD FreeType LAME libtheora libvorbis libvpx Opus NASM \
-	yasm alsa-lib libva libvdpau SDL2 Doxygen Fontconfig FriBidi libdrm \
-	libwebp GnuTLS PulseAudio Speex v4l-utils Xorg-Libs
-	@echo $@ "(opencv4 not supported)"
-
-ffmpeg-min :
-	@echo $@
-
-frei0r-plugins : gavl Doxygen # opencv(currenty broken)
-	@echo $@
-
-Fuse : Doxygen
-	@echo $@
-
-gavl : libpng Doxygen
-	@echo $@
-
-glibmm : libsigc GLib Doxygen glib-networking GnuTLS libxslt
-	@echo $@
-
-GnuPG2 : Fuse ImageMagick libassuan libksba npth pinentry
-	@echo $@
-
-GPGME : clisp GnuPG2 libassuan libsigsegv SWIG
-	@echo $@
-
-gptfdisk : popt ICU
-	@echo $@
-
-grantlee : CMake qt-everywhere
-	@echo $@
-
-grantleetheme : grantlee
-	@echo $@
-
-gst-plugins-bad : FAAC FAAD2 fdk-aac libass libexif libdvdread libdvdnav \
-	libmpeg2 neon opencv OpenJPEG SoundTouch x265 BlueZ cURL \
-	gst-plugins-base GTK3 LCMS2 libgcrypt libgudev librsvg libsndfile \
-	libssh2 libwebp libxkbcommon Nettle Opus SBC Wayland Xorg-Libs \
-	# Valgrind
-	@echo $@
-
-gst-plugins-ugly : liba52 libcdio libdvdread libmpeg2 x264
-	@echo $@
-
-gtkmm : atkmm pangomm GTK2
-	@echo $@
-
-Gwenview : Exiv2 kf5 kf5kipi libkdcraw LCMS2
-	@echo $@
-
-Hspell :
-	@echo $@
-
-Hunspell :
-	@echo $@
-
-hyphen :
-	@echo $@
-
-id3lib : alsa-lib FLAC asciidoc # Valgrind
-	@echo $@
-
-ImageMagick : libgxps libraw OpenEXR OpenJPEG
-	@echo $@
-
-incidenceeditor : kdiagram eventviews
-	@echo $@
-
-jansson :
-	@echo $@
-
-Jinja2 : # MarkupSafe
-	@echo $@
-
-K3b : kf5 libkcddb ffmpeg libburn libdvdread Cdrtools \
-	dvd-rw-tools Cdrdao libmad libmusicbrainz2 libsamplerate \
-	qt-everywhere shared-mime-info taglib UDisks FLAC LAME libsndfile libvorbis
-	@echo $@
-
-K3b-qt5webkit : qt5webkit
-	@echo $@
-
-kaccounts-integration : kf5 libaccounts-qt5 signond
-	@echo $@
-
-kaccounts-providers : kf5
-	@echo $@
-
-kaddressbook : akonadi-contact akonadi-search grantleetheme
-	@echo $@
-
-kalarmcal : kf5 kcalutils kpimtextedit
-	@echo $@
-
-Kate : kf5
-	@echo $@
-
-KCalc : kf5
-	@echo $@
-
-kcalutils : kf5
-	@echo $@
-
-Kdenlive : kf5 mlt breeze-icons v4l-utils
-	@echo $@
-
-kdepim-addons : akonadi-import-wizard Discount incidenceeditor kaddressbook \
-	kitinerary kpkpass
-	@echo $@
-
-kdepim-runtimes : akonadi-notes akonadi-calendar kalarmcal Kmail \
-	# libkolabxml etebase
-	@echo $@
-
-kdewebkit : qt5webkit
-	@echo $@
-
-kf5 : kf5-pre-install-config Aspell GPGME Hspell Hunspell \
-	media-player-info ModemManager NetworkManager Oxygen-fonts \
-	Noto-fonts Jinja2 OpenEXR UDisks UPower
-	@echo $@
-
-kf5-pre-install-config :
-	@echo $@
-
-kf5kipi : kf5
-	@echo $@
-
-kdiagram : qt-everywhere
-	@echo $@
-
-kgpg : kf5 GPGME
-	@echo $@
-
-Khelpcenter : grantlee kf5 xapian libxml2
-	@echo $@
-
-kidentitymanagement : kpimtextedit
-	@echo $@
-
-kimap : kf5
-	@echo $@
-
-kitinerary : kpkpass libxml2 Poppler shared-mime-info \
-	# ZXing PhoneNumber OsmTools
-	@echo $@
-
-kldap : qtkeychain
-	@echo $@
-
-Kmail : libksieve kdewebkit kontactinterface ktnef \
-	mailcommon messagelib kuserfeedback
-	@echo $@
-
-kmail-account-wizard : Kmail
-	@echo $@
-
-kmailtransport : libkgapi ksmtp
-	@echo $@
-
-kmbox : kf5
-	@echo $@
-
-kmime : kf5
-	@echo $@
-
-KMix : kf5 libcanberra alsa-lib PulseAudio
-	@echo $@
-
-kontactinterface : kf5
-	@echo $@
-
-Konversation : kf5 Phonon CMake
-	@echo $@
-
-Konsole : kf5
-	@echo $@
-
-kpimtextedit : kf5
-	@echo $@
-
-kpkpass : kf5 shared-mime-info
-	@echo $@
-
-ksmtp : kf5 Cyrus-SASL
-	@echo $@
-
-ktnef : kcalutils kf5
-	@echo $@
-
-kuserfeedback : qt-everywhere \
-	# php phpunit (recommended deps)
-	@echo $@ "https://github.com/KDE/kuserfeedback.git"
-
-kwave : AudioFile id3lib fftw kf5 alsa-lib FLAC libogg PulseAudio Doxygen
-	@echo $@
-
-liba52 : # djbfft optional
-	@echo $@
-
-libaccounts-glib : GLib gobject-introspection
-	@echo $@ "https://gitlab.com/accounts-sso/libaccounts-glib.git"
-
-libaccounts-qt5 : libaccounts-glib qt-everywhere
-	@echo $@ "https://gitlab.com/accounts-sso/libaccounts-qt.git"
-
-libao : Xorg-Libs Alsa PulseAudio
-	@echo $@
-
-libass : FreeType FriBidi NASM Fontconfig HarfBuzz
-	@echo $@
-
-libassuan : libgpg-error
-	@echo $@
-
-libatasmart :
-	@echo $@
-
-libblockdev : libbytesize parted volume-key gobject-introspection \
-	libyaml btrfs-progs GTK-Doc mdadm
-	@echo $@
-
-libbytesize : PCRE2 GTK-Doc six
-	@echo $@
-
-libburn : Doxygen
-	@echo $@
-
-libcairomm : libsigc Cairo Boost Doxygen
-	@echo $@
-
-libcanberra : libvorbis alsa-lib gstreamer GTK3 GTK2 PulseAudio
-	@echo $@
-
-libcddb :
-	@echo $@
-
-libcdio : libcddb
-	@echo $@
-
-libdbusmenu-qt : Doxygen qt-everywhere
-	@echo $@
-
-libdvdcss : Doxygen
-	@echo $@
-
-libdvdnav : libdvdread
-	@echo $@
-
-libdvdread :
-	@echo $@
-
-libexif : Doxygen Graphviz
-	@echo $@
-
-libgravatar : pimcommon
-	@echo $@
-
-libgxps : GTK3 LCMS2 libarchive libjpeg-turbo libtiff libxslt git \
-	GTK-Doc
-	@echo $@
-
-libidn :
-	@echo $@
-
-libkcddb : kf5 libmusicbrainz5
-	@echo $@
-
-libkdcraw : kf5 libraw
-	@echo $@
-
-libkdepim : kf5
-	@echo $@
-
-libkexiv2 : kf5 Exiv2
-	@echo $@
-
-libkgapi : kf5 Cyrus-SASL
-	@echo $@
-
-libkleo : GPGME kpimtextedit Boost
-	@echo $@
-
-libksba :
-	@echo $@
-
-libksieve : kf5 kmime kimap kpimtextedit Cyrus-SASL
-	@echo $@
-
-libmad :
-	@echo $@
-
-libmbim : libgudev gobject-introspection GTK-Doc
-	@echo $@
-
-libmpeg2 :
-	@echo $@
-
-libmusicbrainz2 : Python2
-	@echo $@
-
-libmusicbrainz5 : neon CMake libxml2 Doxygen
-	@echo $@
-
-libndp :
-	@echo $@
-
-libqmi : libmbim GLib gobject-introspection GTK-Doc
-	@echo $@
-
-libraw : libjpeg-turbo JasPer LCMS2
-	@echo $@
-
-libsigc : Boost libxslt DocBook-Utils Doxygen
-	@echo $@
-
-libsigsegv :
-	@echo $@
-
-lm-sensors : which
-	@echo $@
-
-lmdb :
-	@echo $@
-
-Lua :
-	@echo $@
-
-mailcommon : mailimporter
-	@echo $@
-
-mailimporter : kf5 kimap kmime pimcommon
-	@echo $@
-
-media-player-info :
-	@echo $@
-
-messagelib : akonadi-contact akonadi-mime kgpg kidentitymanagement \
-	kmailtransport kmbox libgravatar
-	@echo $@
-
-mlt : frei0r-plugins libexif qt-everywhere Doxygen fftw SDL2
-	@echo $@
-
-mobile-broadband-provider-info :
-	@echo $@
-
-ModemManager : libmbim libqmi libgudev gobject-introspection \
-	Polkit Vala GTK-Doc
-	@echo $@
-
-neon : GnuTLS libxml2 MIT_Kerberos
-	@echo $@
-
-NetworkManager : dhcp jansson libndp mobile-broadband-provider-info \
-	ModemManager newt UPower \
-	cURL gobject-introspection iptables nss Polkit PyGObject Vala \
-	wpa_supplicant BlueZ DBus-Python GnuTLS GTK-Doc libpsl \
-	qt-everywhere # Valgrind
-	@echo $@
-
-newt : popt slang GPM
-	@echo $@
-
-nodejs : c-ares ICU libuv nghttp2
-	@echo $@
-
-Noto-fonts :
-	@echo $@
-
-npth :
-	@echo $@
-
-ntfs-3g : # fuse 2.x optional (this disables user mounts)
-	@echo $@
-
-Okular : kf5 libkexiv2 Poppler qca libtiff
-	@echo $@
-
-opencv : libexif xine-lib CMake unzip gst-plugins-base GTK3 \
-	JasPer libpng libtiff libwebp v4l-utils apache-ant Doxygen \
-	java Python2
-	@echo $@
-
-OpenEXR :
-	@echo $@
-
-OpenJPEG : CMake LCMS2 libpng libtiff Doxygen
-	@echo $@
-
-Oxygen-fonts :
-	@echo $@
-
-oxygen-icons : extra-cmake-modules qt-everywhere
-	@echo $@
-
-p7zip : # wxWidgets optional
-	@echo $@
-
-pangomm : libcairomm glibmm Pango
-	@echo $@
-
-Parse-Yapp :
-	@echo $@
-
-parted : dosfstools LVM2 dosfstools
-	@echo $@
-
-Phonon : extra-cmake-modules CMake GLib qt-everywhere
-	@echo $@
-
-phonon-backend-gstreamer : gst-plugins-bad gst-plugins-ugly Phonon \
-	gstreamer libxml2 gst-plugins-base gst-plugins-good
-	@echo $@
-
-phonon-backend-vlc : Phonon VLC
-	@echo $@
-
-pimcommon : akonadi akonadi-search kimap kldap libkdepim
-	@echo $@
-
-pinentry : libassuan
-	@echo $@
-
-pipewire : BlueZ ffmpeg gstreamer gst-plugins-base libva PulseAudio SBC \
-	SDL2 v4l-utils Doxygen Graphviz # Valgrind
-	@echo $@
-
-plasma-wayland-protocols : extra-cmake-modules
-	@echo $@
-
-plasma5 : pipewire lm-sensors oxygen-icons smartmontools Xorg_Synaptics_Driver \
-	GConf GTK2 GTK3 kf5 libpwquality libxkbcommon Mesa Wayland \
-	NetworkManager PulseAudio qca sassc taglib xcb-util-cursor fftw \
-	gsettings-desktop-schemas libdbusmenu-qt libcanberra libinput \
-	Linux-PAM GLU ibus
-	@echo $@
-
-polkit-qt : CMake Polkit qt-everywhere
-	@echo $@
-
-Poppler : OpenJPEG CMake Fontconfig Cairo LCMS2 libjpeg-turbo \
-	libpng nss Boost cURL gdk-pixbuf git gobject-introspection \
-	GTK-Doc Pygments GTK3 libtiff qt-everywhere
-	@echo $@
-
-qca : GnuPG2 make-ca CMake qt-everywhere which Cyrus-SASL libgcrypt \
-	libgpg-error nss nspr p11-kit Doxygen which
-	@echo $@
-
-qt5webkit : hyphen
-	@echo $@
-
-qtkeychain : kf5 Cyrus-SASL
-	@echo $@ "https://github.com/frankosterfeld/qtkeychain"
-
-qtwebengine : nodejs nss Python2 qt-everywhere alsa-lib PulseAudio \
-	ffmpeg ICU libwebp libxslt Opus libevent Poppler
-	@echo $@
-
-Samba : jansson lmdb Fuse GPGME Parse-Yapp GnuPG2
-	@echo $@
-
-signond : qt-everywhere
-	@echo $@ "https://gitlab.com/accounts-sso/signond.git"
-
-smartmontools : cURL Lynx wget GnuPG2
-	@echo $@
-
-SoundTouch :
-	@echo $@
-
-SWIG : PCRE Boost
-	@echo $@
-
-UDisks : libatasmart libblockdev dosfstools gptfdisk ntfs-3g \
-	libgudev libxslt Polkit btrfs-progs mdadm xfsprogs \
-	gobject-introspection DBus-Python GTK-Doc LVM2 PyGObject
-	@echo $@
-
-UnRar :
-	@echo $@
-
-UPower : libgudev libusb Polkit gobject-introspection GTK-Doc \
-	PyGObject
-	@echo $@
-
-VLC : FAAD2 libass libmpeg2 liba52 libcddb libdvdcss libdvdread \
-	libdvdnav libidn libmad Lua ffmpeg Samba x264
-	@echo $@
-
-volume-key : GPGME SWIG cryptsetup GLib nss
-	@echo $@
-
-x264 : NASM
-	@echo $@
-
-x265 : CMake NASM
-	@echo $@
-
-xapian : # Valgrind
-	@echo $@
-
-xine-lib : FAAD2 ImageMagick liba52 libdvdcss libdvdnav libmad Samba ffmpeg-min
-	@echo $@
-
-Xorg_Synaptics_Driver : libevdev Xorg-Server
-	@echo $@
-
-XviD : yasm NASM
-	@echo $@