diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 256febe844..0caa2fada4 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -48,7 +48,9 @@ [bdubbs] - Remove references to qt4 in poppler, cmake, - doxygen, qca, and pinentry. + doxygen, qca, pinentry, obconf-qt, qscintilla, qtermwidget, + gst10-plugins-base, v4l-utils, wpa_supplicant, wireshark, + and transmission. [dj] - Add local user and Linux-PAM configuration to vsftpd. diff --git a/kde/libdbusmenuqt.xml b/kde/libdbusmenuqt.xml index ee5611c2e6..7ea1d9bb04 100644 --- a/kde/libdbusmenuqt.xml +++ b/kde/libdbusmenuqt.xml @@ -30,10 +30,7 @@ Introduction to libdbusmenu-qt This library provides a Qt implementation - of the DBusMenu specification that exposes menus via DBus. + of the DBusMenu specification that exposes menus via DBus. &lfs79_checked;&gcc6_checked; diff --git a/lxqt/apps/obconf-qt.xml b/lxqt/apps/obconf-qt.xml index 2c6f46468c..694650edd2 100644 --- a/lxqt/apps/obconf-qt.xml +++ b/lxqt/apps/obconf-qt.xml @@ -33,7 +33,7 @@ The obconf-qt package is an OpenBox Qt based configuration tool. - &lfs79_checked; + &lfs79_checked;&gcc6_checked; Package Information @@ -81,9 +81,8 @@ Required , - and - or - + , and + @@ -107,7 +106,6 @@ cd build && cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ .. && - make diff --git a/lxqt/apps/qscintilla.xml b/lxqt/apps/qscintilla.xml index bf95dbeccf..4425243006 100644 --- a/lxqt/apps/qscintilla.xml +++ b/lxqt/apps/qscintilla.xml @@ -41,7 +41,7 @@ views and, of course, printing. - &lfs79_checked; + &lfs79_checked;&gcc6_checked; Package Information @@ -83,8 +83,7 @@ Required and - (recommended) or - + Optional @@ -103,12 +102,6 @@ Installation of QScintilla - - If Qt4 and Qt5 are - installed, choose which one you prefer, by running source - setqt4 or source setqt5, respectivelly. - - The instructions in this page are just for the @@ -149,12 +142,6 @@ ln -sfv libqscintilla2.so.12.0.1 $QT5DIR/lib/libqt5scintilla2.so.12< install -v -m644 ../doc/html-Qt4Qt5/* \ $QT5DIR/share/doc/QScintilla-&qscintilla-version;/html - - When building with - Qt4, replace QT5DIR with - QT4DIR. - - Command Explanations @@ -179,12 +166,10 @@ install -v -m644 ../doc/html-Qt4Qt5/* \ None - $QT5DIR/lib/libqt5scintilla2.so or $QT4DIR/lib/libqtscintilla2.so + $QT5DIR/lib/libqt5scintilla2.so $QT5DIR/{include/Qsci,qsci,share/doc/QScintilla-&qscintilla-version;}/html - or - $QT4DIR/{include/Qsci,qsci,share/doc/QScintilla-&qscintilla-version;}/html diff --git a/lxqt/apps/qtermwidget.xml b/lxqt/apps/qtermwidget.xml index b37f2daf36..15fb1ea9ba 100644 --- a/lxqt/apps/qtermwidget.xml +++ b/lxqt/apps/qtermwidget.xml @@ -34,7 +34,7 @@ terminal widget for Qt. - &lfs79_checked; + &lfs79_checked;&gcc6_checked; Package Information @@ -74,9 +74,8 @@ Required - and - or - + , and + @@ -89,15 +88,8 @@ Installation of qtermwidget - If you have Qt4 and - Qt5 installed, run source - setqt4 or source setqt5, respectively, in - order to link qtermwidget to the one of your - choice. Following instructions are for Qt5 - linking. For compilation with Qt4, see - Command Explanations, below. Install - qtermwidget by running the following - commands: + Install qtermwidget by running the + following commands: mkdir -v build && @@ -136,15 +128,12 @@ make -DBUILD_DESIGNER_PLUGIN=0: This switch is necessary, because building the Qt designer plugin is not supported for - Qt5 yet. Toggle to 1 or remove, if you prefer - to use Qt4. + Qt5 yet. -DUSE_QT5=true: This switch is used in order to - build this application linked to Qt5. Toggle - to false, if you prefer to use - Qt4. + build this application linked to Qt5. @@ -162,13 +151,10 @@ make None - libqtermwidget5.so or - libqtermwidget4.so and - /usr/lib/qt4/plugins/designer/libqtermwidget4plugin.so + libqtermwidget5.so - /usr/{include,share{/cmake,}}/qtermwidget5 or - /usr/{include,share{/cmake,}}/qtermwidget4 + /usr/{include,share{/cmake,}}/qtermwidget5 @@ -189,19 +175,7 @@ make - - - libqtermwidget4.so - - - contains the libqtermwidget4 API functions. - - - libqtermwidget4.so - - - - + diff --git a/multimedia/libdriv/gst10-plugins-base.xml b/multimedia/libdriv/gst10-plugins-base.xml index 5405721c2c..b7365a7767 100644 --- a/multimedia/libdriv/gst10-plugins-base.xml +++ b/multimedia/libdriv/gst10-plugins-base.xml @@ -104,7 +104,7 @@ , , , - , + , , libvisual, Orc, and diff --git a/multimedia/libdriv/v4l-utils.xml b/multimedia/libdriv/v4l-utils.xml index ed58766fb8..594f75430d 100644 --- a/multimedia/libdriv/v4l-utils.xml +++ b/multimedia/libdriv/v4l-utils.xml @@ -35,7 +35,7 @@ most webcams (libv4l), and providing tools to test V4L devices. - &lfs79_checked; + &lfs79_checked;&gcc6_checked; Package Information @@ -83,7 +83,6 @@ Recommended and - or @@ -100,16 +99,6 @@ Installation of v4l-utils - - If both Qt4 and Qt5 are installed, Qt5 will be used. If you choose to - build against Qt4, temporarily hide it from - PKG_CONFIG_PATH, issuing: - - -SAVEPATH=$PKG_CONFIG_PATH && -PKG_CONFIG_PATH="\ -`echo $PKG_CONFIG_PATH | sed 's@:/opt/qt5/lib/pkgconfig@@'`" - Install v4l-utils by running the following commands: @@ -120,14 +109,6 @@ PKG_CONFIG_PATH="\ --disable-static && make - - Again, if both Qt4 and 5 are installed and you chose to build against Qt4, - restore PKG_CONFIG_PATH: - - -PKG_CONFIG_PATH=$SAVEPATH && -unset SAVEPATH - This package does not come with a testsuite. diff --git a/networking/netprogs/wpa_supplicant.xml b/networking/netprogs/wpa_supplicant.xml index d81153f492..39224d93a7 100644 --- a/networking/netprogs/wpa_supplicant.xml +++ b/networking/netprogs/wpa_supplicant.xml @@ -40,7 +40,7 @@ access point. - &lfs79_checked; + &lfs79_checked;&gcc6_checked; Package Information @@ -88,7 +88,7 @@ , , and - + User Notes: @@ -189,11 +189,14 @@ EOF make BINDIR=/sbin LIBDIR=/lib - If you have installed and wish to build + If you have installed and wish to build the WPA Supplicant GUI program, run the following commands: + The following directory name is labelled qt4, but + is compatible with . + pushd wpa_gui-qt4 && qmake wpa_gui.pro && make && diff --git a/networking/netutils/wireshark.xml b/networking/netutils/wireshark.xml index 75988d9923..88feb143b7 100644 --- a/networking/netutils/wireshark.xml +++ b/networking/netutils/wireshark.xml @@ -43,7 +43,7 @@ other popular network analyzers. - &lfs79_checked; + &lfs79_checked;&gcc6_checked; Package Information @@ -122,8 +122,7 @@ Optional (for GUI front-ends) - , or - , + @@ -134,9 +133,7 @@ - The Qt GUI needs one of or . If both are installed, Qt5 - is used by default. + The Qt GUI needs . @@ -272,8 +269,6 @@ chmod -v 6550 /usr/bin/{tshark,dumpcap} : For the Qt GUI. Default is yes. - If both Qt4 and 5 are installed, Qt5 is chosen by default. Notice that the - GUI for only one Qt version (either 4 or 5) can be built. diff --git a/xsoft/other/transmission.xml b/xsoft/other/transmission.xml index 57cf7a29b8..683c1248c3 100644 --- a/xsoft/other/transmission.xml +++ b/xsoft/other/transmission.xml @@ -36,7 +36,7 @@ bandwidth. - &lfs79_checked; + &lfs79_checked;&gcc6_checked; Package Information @@ -83,8 +83,7 @@ Recommended (to build a GUI) - and either - or + and @@ -109,15 +108,6 @@ ./configure --prefix=/usr && make - - The following commands are used if you have installed Qt and would like - to compile the Qt GUI. If Qt4 and - Qt5 are installed in - /opt, use - source setqt4 or source setqt5 to - choose which one will be used to build the Qt GUI. - - Compile the Qt GUI with the following commands: