From e151ca6df14d56f635ffbf08bfb80f69007a6d28 Mon Sep 17 00:00:00 2001 From: William Harrington <kb0iic@berzerkula.org> Date: Wed, 26 May 2021 13:56:35 -0500 Subject: Update with master changes. --- blfs/KDE.Makefile | 269 ++++++++++++++++++++++++++++++++++++++++++++++++++---- blfs/QT5.Makefile | 7 +- 2 files changed, 255 insertions(+), 21 deletions(-) diff --git a/blfs/KDE.Makefile b/blfs/KDE.Makefile index 26e8873..7d00b65 100644 --- a/blfs/KDE.Makefile +++ b/blfs/KDE.Makefile @@ -7,23 +7,62 @@ # wpa_supplicant cairo doxygen cmake graphviz # suggest waiting for cairo and graphviz for later -kde = extra-cmake-modules opencv-ffmpeg phonon-backend-gstreamer \ +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 + 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: $(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 # qt-everywhere libxml2 lxml @echo $@ +c-ares : # CMake + @echo $@ + +calendarsupport : akonadi-notes + @echo $@ + Cdrdao : gtkmm libao libmad # libvorbis LAME @echo $@ @@ -33,19 +72,25 @@ Cdrtools : # alsa-lib cpio : @echo $@ -dvd-rw-tools : Cdrtools +dhcp : + @echo $@ "(client only)" + +Discount : @echo $@ -dosfstools : +Dolphin : baloo-widgets # packagekit-qt @echo $@ -extra-cmake-modules : # CMake +dvd-rw-tools : Cdrtools @echo $@ -Aspell : # which +dosfstools : @echo $@ -Clisp : libsigsegv +eventviews : akonadi-calendar kmime calendarsupport + @echo $@ + +extra-cmake-modules : # CMake @echo $@ Exiv2 : # CMake cURL Doxygen Graphviz libxslt @@ -57,6 +102,9 @@ FAAC : FAAD2 : @echo $@ +Falkon : extra-cmake-modules qtwebengine kf5 + @echo $@ + fdk-aac : @echo $@ @@ -64,6 +112,9 @@ ffmpeg : libass fdk-aac x264 x265 frei0r-plugins libcdio opencv OpenJPEG \ Samba XviD # FreeType2 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) @@ -81,7 +132,7 @@ glibmm : libsigc # GLib Doxygen glib-networking GnuTLS libxslt GnuPG2 : Fuse ImageMagick libassuan libksba npth pinentry @echo $@ -GPGME : Clisp GnuPG2 libassuan SWIG +GPGME : GnuPG2 libassuan libsigsegv SWIG @echo $@ gptfdisk : # popt ICU @@ -90,6 +141,9 @@ gptfdisk : # popt ICU 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 \ @@ -103,7 +157,7 @@ gst-plugins-ugly : liba52 libcdio libdvdread libmpeg2 x264 gtkmm : atkmm pangomm # GTK2 @echo $@ -Gwenview : Exiv2 kf5 libkdcraw # LCMS2 KF5Kipi(optional) +Gwenview : Exiv2 kf5 kf5kipi libkdcraw # LCMS2 @echo $@ Hspell : @@ -112,7 +166,16 @@ Hspell : Hunspell : @echo $@ -ImageMagick : libgxps libraw OpenJPEG # -ffmpeg +hyphen : + @echo $@ + +id3lib : # alsa-lib FLAC asciidoc Valgrind + @echo $@ + +ImageMagick : libgxps libraw OpenEXR OpenJPEG # -ffmpeg + @echo $@ + +incidenceeditor : kdiagram eventviews @echo $@ jansson : @@ -123,12 +186,47 @@ Jinja2 : # MarkupSafe K3b : kf5 libkcddb UDisks ffmpeg libburn libdvdread Cdrtools \ dvd-rw-tools Cdrdao libmad libmusicbrainz2 # libsamplerate \ - shared-mime-info taglib FLAC LAME libsndfile libvorbis + shared-mime-info taglib FLAC LAME libsndfile libvorbis Qt5WebKitWidgets + @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-runtime : 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 @@ -137,18 +235,83 @@ kf5 : kf5-pre-install-config Aspell GPGME Hspell Hunspell \ 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 qt-everywhere + @echo $@ + Konsole : kf5 @echo $@ +kpimtextedit : kf5 + @echo $@ + +kpkpass : kf5 # shared-mime-info + @echo $@ + +ksmtp : kf5 # Cyrus-SASL + @echo $@ + +ktnef : kcalutils kf5 + @echo $@ + +kwave : AudioFile id3lib # fftw kf5 alsa-lib FLAC libogg PulseAudio Doxygen + @echo $@ + liba52 : # djbfft optional @echo $@ +libaccounts-glib : # GLib gobjecct-introspection + @echo $@ + +libaccounts-qt5 : libaccounts-glib # qt-everywhere + @echo $@ + libao : # Xorg-Libs Alsa PulseAudio @echo $@ @@ -189,7 +352,7 @@ libdbusmenu-qt : # Doxygen qt-everywhere libdvdcss : # Doxygen @echo $@ -libdvdnav : +libdvdnav : libdvdread @echo $@ libdvdread : @@ -198,6 +361,9 @@ libdvdread : libexif : # Doxygen Graphviz @echo $@ +libgravatar : pimcommon + @echo $@ + libgxps : # GTK3 LCMS2 libarchive libjpeg-turbo libtiff libxslt git \ GTK-Doc @echo $@ @@ -211,12 +377,24 @@ libkcddb : kf5 libmusicbrainz5 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 $@ @@ -247,18 +425,34 @@ libsigc : # Boost libxslt DocBook-utils Doxygen 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 $@ @@ -266,7 +460,8 @@ ModemManager : libmbim libqmi # libgudev gobject-introspection \ neon : # GnuTLS libxml2 MIT_Kerberos @echo $@ -NetworkManager : jansson libndp ModemManager newt UPower \ +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 @@ -275,6 +470,9 @@ NetworkManager : jansson libndp ModemManager newt UPower \ newt : # popt slang GPM @echo $@ +nodejs : c-ares # ICU libuv nghttp2 + @echo $@ + Noto-fonts : @echo $@ @@ -292,9 +490,6 @@ opencv : libexif xine-lib # CMake UnZip gst-plugins-base GTK3 \ java Python2 @echo $@ -opencv-ffmpeg : ffmpeg - @echo $@ - OpenEXR : @echo $@ @@ -304,6 +499,9 @@ OpenJPEG : # CMake LCMS2 libpng libtiff Doxygen Oxygen-fonts : @echo $@ +oxygen-icons : # extra-cmake-modules qt-everywhere + @echo $@ + p7zip : # wxWidgets optional @echo $@ @@ -313,7 +511,7 @@ pangomm : libcairomm glibmm # Pango Parse-Yapp : @echo $@ -parted : # LVM2 dosfstools +parted : dosfstools # LVM2 dosfstools @echo $@ Phonon : extra-cmake-modules # CMake GLib qt-everywhere @@ -326,12 +524,26 @@ phonon-backend-gstreamer : gst-plugins-bad gst-plugins-ugly Phonon \ 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 Valgrind Doxygen Graphviz + @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 ffts \ + gsettings-desktop-schemas libdbusmenu-qt libcanberra libinput \ + Linux-PAM GLU, ibus + @echo $@ + polkit-qt : # CMake Polkit qt-everywhere @echo $@ @@ -344,9 +556,25 @@ 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 $@ + +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 $@ + +smartmontools : # cURL Lynx wget GnuPG2 + @echo $@ + SoundTouch : @echo $@ @@ -366,7 +594,7 @@ UPower : # libgudev libusb Polkit gobject-introspection GTK-Doc \ @echo $@ VLC : FAAD2 libass libmpeg2 liba52 libcddb libdvdcss libdvdread \ - libdvdnav libidn libmad Lua opencv-ffmpeg Samba x264 + libdvdnav libidn libmad Lua ffmpeg Samba x264 @echo $@ volume-key : GPGME SWIG # cryptsetup GLib NSS @@ -381,7 +609,10 @@ x265 : # CMake NASM xapian : # Valgrind @echo $@ -xine-lib : FAAD2 ImageMagick liba52 libdvdcss libmad Samba # -ffmpeg +xine-lib : FAAD2 ImageMagick liba52 libdvdcss libdvdnav libmad Samba ffmpeg-min + @echo $@ + +Xorg_Synaptics_Driver : # libevdev Xorg-Server @echo $@ XviD : # yasm or NASM diff --git a/blfs/QT5.Makefile b/blfs/QT5.Makefile index 65d68fd..e0794ec 100644 --- a/blfs/QT5.Makefile +++ b/blfs/QT5.Makefile @@ -7,8 +7,8 @@ # wpa_supplicant cairo doxygen cmake graphviz # suggest waiting for cairo and graphviz for later -qt5 = qt-everywhere Avahi-qt CMake-qt gst-plugins-good-qt libtheora-qt \ - v4l-utils-qt wpa_supplicant-qt +qt5 = qt-everywhere Avahi-qt CMake-qt gst-plugins-base-qt \ + gst-plugins-good-qt v4l-utils-qt wpa_supplicant-qt all: $(qt5) @@ -105,6 +105,9 @@ gst-plugins-base : alsa-lib CDParanoia-III graphene gstreamer libogg libtheora \ libgudev Mesa wayland-protocols Xorg-Libs @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 Valgrind \ -- cgit v1.2.3-54-g00ecf