Major changes

1 files changed, 280 insertions, 0 deletions

diff --git a/blfs/QT5.Makefile b/blfs/QT5.Makefile
index 906b358..aa1e2a6 100644
--- a/blfs/QT5.Makefile
+++ b/blfs/QT5.Makefile
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # 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

@@ -282,3 +283,282 @@ xdg-utils : # xmlto Lynx Xorg-Apps dbus
 

 wpa_supplicant-qt : qt-everywhere

 	@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
+
+qt5 = qt-everywhere Avahi-qt CMake-qt gst-plugins-base-qt \
+	  gst-plugins-good-qt v4l-utils-qt wpa_supplicant-qt
+
+
+all: Systemd-Extras $(qt5)
+
+qt-everywhere : Alsa Cups gst-plugins-good JasPer libmng libtiff-libwebp \
+	ibus MariaDB pciutils PostgreSQL Python2 PulseAudio SDL2 unixODBC \
+	Xorg-Libs make-ca GLib HarfBuzz ICU libjpeg-turbo libpng libtiff \
+	libxkbcommon Mesa MIT_Kerberos mtdev PCRE2 sqlite3 Wayland xcb-util-image \
+	xcb-util-keysyms xcb-util-renderutil xcb-util-wm BlueZ libinput
+	@echo $@
+
+AAlib : GPM slang Xorg-Libs
+	@echo $@
+
+Alsa : alsa-lib alsa-plugins alsa-utils alsa-oss
+	@echo $@
+
+alsa-lib : Python2 Doxygen
+	@echo $@
+
+alsa-oss : alsa-lib
+	@echo $@
+
+alsa-plugins : alsa-lib libsamplerate PulseAudio Speex
+	@echo $@
+
+alsa-utils : alsa-lib fftw libsamplerate docutils xmlto
+	@echo $@
+
+Avahi : libdaemon libglade DBus-Python PyGTK \
+	GLib gobject-introspection GTK2 GTK3 libevent Doxygen
+	@echo $@
+
+Avahi-qt : qt-everywhere
+	@echo $@
+
+bash-completion :
+	@echo $@ "https://github.com/scop/bash-completion"
+
+Boost : which ICU
+	@echo $@
+
+CDParanoia-III :
+	@echo $@
+
+CMake-qt : qt-everywhere
+	@echo $@
+
+colord: LCMS2 libgusb SANE Polkit sqlite3 gobject-introspection libgudev Vala
+	@echo $@
+
+Cups : Avahi colord libpaper Python2 xdg-utils libusb Linux-PAM java # dbus
+	@echo $@
+
+dbus-glib : GLib GTK-Doc # dbus
+	@echo $@
+
+DBus-Python : Python2 PyGObject docutils GLib # dbus
+	@echo $@
+
+DConf : bash-completion GLib GTK3 libxml2 libxslt Vala GTK-Doc # dbus
+	@echo $@
+
+fftw :
+	@echo $@
+
+FLAC : libogg NASM DocBook-Utils Doxygen # Valgrind
+	@echo $@
+
+GConf : dbus-glib libxml2 gobject-introspection GTK3 Polkit OpenLDAP
+	@echo $@
+
+giflib : # xmlto
+	@echo $@
+
+glib-networking : gsettings-desktop-schemas GLib GnuTLS make-ca
+	@echo $@
+
+GPM :
+	@echo $@
+
+gsettings-desktop-schemas : GLib gobject-introspection
+	@echo $@
+
+Gsl :
+	@echo $@
+
+graphene :
+	@echo $@
+
+gst-plugins-base : alsa-lib CDParanoia-III graphene gstreamer libogg libtheora \
+	libvorbis Opus SDL2 gobject-introspection ISO-Codes \
+	libgudev Mesa Wayland-Protocols Xorg-Libs # Valgrind
+	@echo $@
+
+gst-plugins-base-qt : qt-everywhere
+	@echo $@
+
+gst-plugins-good : AAlib alsa-oss FLAC gst-plugins-base LAME libcaca \
+	libdv libsoup libvpx mpg123 PulseAudio Speex taglib v4l-utils \
+	Cairo GTK3 libgudev libjpeg-turbo libpng Mesa Wayland \
+	NASM Xorg-Libs # Valgrind
+	@echo $@
+
+gst-plugins-good-qt : qt-everywhere
+	@echo $@
+
+gstreamer : Gsl GLib gobject-introspection GTK3 # Valgrind
+	@echo $@
+
+ibus : DConf libnotify DBus-Python PyGObject PyXDG \
+	ISO-Codes Vala gobject-introspection GTK2 GTK-Doc libxkbcommon \
+	Wayland
+	@echo $@
+
+Imlib2 : giflib libid3tag Xorg-Libs libpng libjpeg-turbo libtiff-webp
+	@echo $@
+
+JasPer : CMake libjpeg-turbo freeglut
+	@echo $@
+
+LAME : libsndfile NASM
+	@echo $@
+
+LCMS2 : libjpeg-turbo libtiff
+	@echo $@
+
+libcaca : Imlib2 slang Xorg-Libs
+	@echo $@
+
+libdaemon : Doxygen Lynx
+	@echo $@
+
+libdazzle : GTK3 Vala
+	@echo $@
+
+libdv : popt Xorg-Libs
+	@echo $@
+
+libglade : Python2 libxml2 GTK2 GTK-Doc
+	@echo $@
+
+libgusb : usbutils libusb GTK-Doc gobject-introspection Vala
+	@echo $@
+
+libid3tag :
+	@echo $@
+
+libmng : LCMS2 libjpeg-turbo
+	@echo $@
+
+libnotify : GTK3 gobject-introspection GTK-Doc xmlto
+	@echo $@
+
+libogg :
+	@echo $@
+
+libpaper :
+	@echo $@
+
+libsamplerate : alsa-lib libsndfile fftw
+	@echo $@
+
+libsndfile : alsa-lib FLAC libvorbis Opus Speex sqlite3
+	@echo $@
+
+libsoup : glib-networking libpsl sysprof libxml2 sqlite3 \
+	gobject-introspection Vala
+	@echo $@
+
+libtheora : libogg libvorbis
+	@echo $@
+
+libtheora-qt : qt-everywhere
+	@echo $@
+
+libvorbis : libogg
+	@echo $@
+
+libvpx : yasm NASM which cURL Doxygen
+	@echo $@
+
+libwebp : giflib libjpeg-turbo libpng libtiff
+	@echo $@
+
+libtiff-libwebp : libwebp
+	@echo $@
+
+MariaDB : Boost Ruby unixODBC \
+	CMake libevent libaio libxml2 Linux-PAM MIT_Kerberos PCRE # Valgrind
+	@echo $@
+
+mpg123 : alsa-lib Boost PulseAudio
+	@echo $@
+
+Opus :
+	@echo $@
+
+pciutils : cURL wget Lynx
+	@echo $@
+
+PostgreSQL : Python2 ICU libxml2 OpenLDAP Linux-PAM MIT_Kerberos \
+	fop docbook-dtd docbook-dsssl DocBook-Utils OpenJade SGMLSpm
+	@echo $@
+
+PulseAudio : libsndfile alsa-lib Speex Avahi fftw GConf libsamplerate SBC \
+	GLib libcap-pam Xorg-Libs BlueZ Doxygen GTK3 # Valgrind dbus
+	@echo $@
+
+PyCairo : Python2 Cairo
+	@echo $@
+
+PyGObject : PyCairo Python2
+	@echo $@
+
+PyGTK : libglade PyCairo PyGObject Python2 ATK GTK2 libxslt Pango
+	@echo $@
+
+Python2 : BlueZ sqlite3 Tk # Valgrind
+	@echo $@
+
+PyXDG : Python2
+	@echo $@
+
+Ruby : Berkeley_DB Doxygen Graphviz Tk # Valgrind
+	@echo $@
+
+SANE : Avahi v4l-utils
+	@echo $@
+
+SBC : libsndfile
+	@echo $@
+
+SDL2 : Alsa ibus PulseAudio libsamplerate \
+   	libxkbcommon Wayland-Protocols Xorg-Libs Doxygen NASM
+	@echo $@
+
+slang : libpng PCRE
+	@echo $@
+
+Speex : libogg # Valgrind
+	@echo $@
+
+sysprof : libdazzle GTK3 Polkit
+	@echo $@
+
+taglib : CMake
+	@echo $@
+
+v4l-utils : alsa-lib SDL2 Doxygen GLU libjpeg-turbo
+	@echo $@
+
+v4l-utils-qt : qt-everywhere
+	@echo $@
+
+unixODBC :
+	@echo $@
+
+usbutils : libusb wget
+	@echo $@
+
+xdg-utils : xmlto Lynx Xorg-Apps # dbus
+	@echo $@
+
+wpa_supplicant-qt : qt-everywhere
+	@echo $@
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28