diff --git a/general.ent b/general.ent index e28ad2baec..9f1f0c8e54 100644 --- a/general.ent +++ b/general.ent @@ -1,12 +1,12 @@ - + - + diff --git a/general/genutils/pinentry.xml b/general/genutils/pinentry.xml index 953fea2f8d..9fecdf79be 100644 --- a/general/genutils/pinentry.xml +++ b/general/genutils/pinentry.xml @@ -86,7 +86,7 @@ Install PIN-Entry by running the following commands: -CXXFLAGS=-std=c++11 ./configure --prefix=/usr && +./configure --prefix=/usr && make + + July 15th, 2015 + + + [fernando] - Update to libepoxy-1.3.1. Fixes + #6726. + + + [fernando] - Update to Samba-4.2.3. Fixes + #6721. + + + [fernando] - Update to network-manager-applet-1.0.4. Fixes + #6720. + + + [fernando] - Update to NetworkManager-1.0.4. Fixes + #6720. + + + + July 15th, 2015 diff --git a/lxqt/desktop/lxqt-common.xml b/lxqt/desktop/lxqt-common.xml index 0bb1dc520b..073d5cfecd 100644 --- a/lxqt/desktop/lxqt-common.xml +++ b/lxqt/desktop/lxqt-common.xml @@ -75,18 +75,18 @@ , (runtime - may be replaced by another WM, e.g. - , but it was not tested for BLFS), + , but this has not been tested for BLFS), built with , and Recommended - , or + alone or with or another Display Manager, e.g. - sddm (this is reported - as the recommended LXQt display - manager, + sddm (this has been + reported as the recommended LXQt + display manager), , , and diff --git a/lxqt/desktop/lxqt-policykit.xml b/lxqt/desktop/lxqt-policykit.xml index d83a620778..7d794ce642 100644 --- a/lxqt/desktop/lxqt-policykit.xml +++ b/lxqt/desktop/lxqt-policykit.xml @@ -30,7 +30,7 @@ Introduction to lxqt-policykit - The lxqt-policykit package the + The lxqt-policykit package is the LXQt PolicyKit agent. diff --git a/lxqt/desktop/lxqt-runner.xml b/lxqt/desktop/lxqt-runner.xml index de423a6830..f6e54f93eb 100644 --- a/lxqt/desktop/lxqt-runner.xml +++ b/lxqt/desktop/lxqt-runner.xml @@ -74,7 +74,7 @@ Required - kwindowsystem, from + kwindowsystem, from , , and diff --git a/lxqt/desktop/post-install.xml b/lxqt/desktop/post-install.xml index 58c396b04a..e894d4605b 100644 --- a/lxqt/desktop/post-install.xml +++ b/lxqt/desktop/post-install.xml @@ -37,11 +37,11 @@ Recommended - , or + alone or with or another Display Manager, e.g. - sddm (this is reported - as the recommended LXQt display - manager + sddm (this has been + reported as the recommended LXQt + display manager) diff --git a/lxqt/desktop/pre-install.xml b/lxqt/desktop/pre-install.xml index 855244026f..eee1632eda 100644 --- a/lxqt/desktop/pre-install.xml +++ b/lxqt/desktop/pre-install.xml @@ -20,7 +20,7 @@ LXQt can be installed in /usr or /opt/lxqt. The BLFS editors recommend - the latter in the BLFS environment. The former has not been tests in + the latter in the BLFS environment. The former has not been tested in BLFS. diff --git a/networking/netprogs/samba.xml b/networking/netprogs/samba.xml index f61ac3cf78..3b18d8d35e 100644 --- a/networking/netprogs/samba.xml +++ b/networking/netprogs/samba.xml @@ -6,10 +6,10 @@ - + - - + + ]> @@ -114,16 +114,6 @@ dependencies. - Fix some code when building with gnutls-3.4 and later: - -sed -e 's/.*set_priority.*/\tgnutls_priority_set_direct(tls->session, "NORMAL:+CTYPE-OPENPGP", NULL);/' \ - -e '/cert_type_priority/d' \ - -i source4/lib/tls/tls.c && -sed -e 's/.*set_priority.*/\tgnutls_priority_set_direct(tlss->tls_session, "NORMAL:+CTYPE-OPENPGP", NULL);/' \ - -e '/t cert_type_priority/ s:^:/*:' \ - -e '/t cert_type_priority/{n;N;N;N;s:$:*/:}' \ - -i source4/lib/tls/tls_tstream.c - Install Samba by running the following commands: diff --git a/networking/netutils/networkmanager.xml b/networking/netutils/networkmanager.xml index 07d74d03d3..742d9cf8ee 100644 --- a/networking/netutils/networkmanager.xml +++ b/networking/netutils/networkmanager.xml @@ -8,10 +8,10 @@ "&gnome-download-http;/NetworkManager/1.0/NetworkManager-&NetworkManager-version;.tar.xz"> - - - - + + + + ]> @@ -121,11 +121,8 @@ Installation of NetworkManager - If and are installed, you - need to choose Qt4 with - source setqt4, before starting. Install - NetworkManager by running the following - commands: + Install NetworkManager by running the + following commands: ./configure --prefix=/usr \ @@ -263,11 +260,10 @@ EOF /etc/NetworkManager, - /usr/include/{libnm,libnm-glib,NetworkManager}, + /usr/include/{libnm{,-glib},NetworkManager}, /usr/lib/NetworkManager, /usr/share/doc/NetworkManager-&NetworkManager-version;, - /usr/share/gtk-doc/html/{libnm,libnm-glib,libnm-util,NetworkManager}, - and + /usr/share/gtk-doc/html/{libnm{,-glib,-util},NetworkManager}, and /var/{lib,run}/NetworkManager diff --git a/packages.ent b/packages.ent index 628aec4bc2..58fc9c629d 100644 --- a/packages.ent +++ b/packages.ent @@ -109,7 +109,7 @@ - + @@ -356,7 +356,7 @@ - + @@ -365,7 +365,7 @@ - + diff --git a/x/installing/xorg-server.xml b/x/installing/xorg-server.xml index a6c4ef64d2..ed8b0ae9ff 100644 --- a/x/installing/xorg-server.xml +++ b/x/installing/xorg-server.xml @@ -95,7 +95,7 @@ Recommended (required for glamor, see command - explanations below) + explanations below) and (used by Xnest) diff --git a/x/lib/libepoxy.xml b/x/lib/libepoxy.xml index 0b7d1cf7c4..e2400045fd 100644 --- a/x/lib/libepoxy.xml +++ b/x/lib/libepoxy.xml @@ -4,12 +4,12 @@ %general-entities; - + - - - - + + + + ]> @@ -90,12 +90,11 @@ commands: -./autogen.sh --prefix=/usr && +./configure --prefix=/usr && make - To test the results, issue: make -k check. Some - tests may fail for unknown reasons. + To test the results, issue: make check. diff --git a/x/lib/webkitgtk.xml b/x/lib/webkitgtk.xml index 6cc18c0c27..23e0b42b68 100644 --- a/x/lib/webkitgtk.xml +++ b/x/lib/webkitgtk.xml @@ -145,15 +145,15 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DPORT=GTK \ -DLIB_INSTALL_DIR=/usr/lib \ + -DENABLE_MINIBROWSER=ON \ -Wno-dev .. && make - This package does not have a working testsuite. + This package does not have a working testsuite. However, there is a + useable basic graphical web browser in the build directory, + build/bin/MiniBrowser. If launching it fails, + there is a problem with the build. @@ -185,6 +185,11 @@ install -vm644 ../Documentation/webkitdomgtk-4.0/html/* \ sed -i ...: Fixes typos in two source code files. + + -DENABLE_MINIBROWSER=ON: This switch enables the + Mini Browser compilation and install. + + : This switch enables building against the system installed malloc. @@ -214,7 +219,7 @@ install -vm644 ../Documentation/webkitdomgtk-4.0/html/* \ - jsc + jsc and MiniBrowser libjavascriptcoregtk-4.0.so and @@ -247,6 +252,18 @@ install -vm644 ../Documentation/webkitdomgtk-4.0/html/* \ + + MiniBrowser + + + is a very simple graphical browser. + + + MiniBrowser + + + + libjavascriptcoregtk-4.0.so