diff --git a/general.ent b/general.ent
index 794f83cb9d..6fb8419215 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
-
+
-
+
diff --git a/general/graphlib/poppler.xml b/general/graphlib/poppler.xml
index cf8fc5b416..57f488a249 100644
--- a/general/graphlib/poppler.xml
+++ b/general/graphlib/poppler.xml
@@ -6,10 +6,10 @@
-
+
-
-
+
+
@@ -165,29 +165,20 @@
rm -rf testfiles &&
git clone git://git.freedesktop.org/git/poppler/test testfiles
-
-
- This package can be optionally built with support for only one version of
- Qt4 or Qt5. If you have only one, no modification is necessary. If both
- are installed, and you wish support for only one, before executing the
- configure command given below, use this command to
- select Qt4:
-
- source /usr/bin/setqt4
-
- or this to select Qt5:
-
- source /usr/bin/setqt5
-
+
+
+ This package can be optionally built with support for only one version
+ of Qt4 or Qt5 or without any Qt support. You can selectively disable
+ support for one or both, see "Command Explanations" section, below.
+
+
Install Poppler by running the following
commands:
-MOCQT4=$QT4DIR/bin/moc \
-MOCQT5=$QT5DIR/bin/moc \
-./configure --prefix=/usr \
+./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-static \
--enable-build-type=release \
@@ -238,15 +229,6 @@ cd poppler-data-&poppler-data-version;Command Explanations
-
- MOCQT4=$QT4DIR/bin/moc and
- MOCQT5=$QT5DIR/bin/moc:
- These environment variables are necessary, for linking with the two Qt
- versions, if both are installed. If only one Qt version is installed or
- you wish to link to only one version, you can remove them, although this
- is not necessary.
-
-
--enable-build-type=release: This switch is used
to apply a higher level of compiler optimizations. Other options are:
@@ -280,6 +262,14 @@ cd poppler-data-&poppler-data-version;
+
+ : Don't compile poppler Qt4 wrapper.
+
+
+
+ : Don't compile poppler Qt5 wrapper.
+
+
LC_ALL=en_US.UTF-8 make check: Run the test suite.
The environment variable LC_ALL=en_US.UTF-8 is only needed if the
@@ -310,9 +300,7 @@ cd poppler-data-&poppler-data-version;
libpoppler-qt5.so
- /usr/include/poppler,
- /usr/share/poppler,
- /usr/share/gtk-doc/html/poppler, and
+ /usr/{include,share,share/gtk-doc/html}/poppler and
/usr/share/doc/poppler-&poppler-version;
diff --git a/general/prog/cmake.xml b/general/prog/cmake.xml
index 7cf6d2f682..fceaa9fee1 100644
--- a/general/prog/cmake.xml
+++ b/general/prog/cmake.xml
@@ -122,14 +122,15 @@ make
-j<N> -O
cmake-&cmake-version;-test.log, where
<N> is an integer between 1 and the
- number of system cores. For some systems, it may be necessary to run
- the tests only for Qt4 using source setq4, then
+ number of system cores. For some systems, it may be necessary to run the
+ tests only for Qt4 using source setq4, then
export CXXFLAGS="-std=c++11" before the
./bootstrap ...) command. If used, be sure to
- unset CXXFLAGS after the tests. All the
- problematic tests relate to the test procedures finding the correct
- Qt files. Five of 447 test are known to fail under some circumstances.
-
+ unset CXXFLAGS after the tests. One of the problematic
+ tests relates to the test procedures finding the correct Qt files. Eight
+ of 447 tests are known to fail under some circumstances related to Gtk+2
+ and c++ standards.
+
There has been a report that the tests may fail if running inside a
@@ -441,7 +441,7 @@ kill $DBUS_SESSION_BUS_PID
dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor,
dbus-run-session, dbus-send, dbus-test-tool,
- dbus-update-activation-environment, and dbus-uuidgenn
+ dbus-update-activation-environment, and dbus-uuidgen
libdbus-1.so
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 212c854bd5..f016b49bfc 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,6 +43,34 @@
-->
+
+
+ November 18th, 2015
+
+
+ [fernando] - Update to gtk+-3.18.5 (gtk+3.18.5). Fixes
+ #7142.
+
+
+ [fernando] - Update to dbus-1.10.4. Fixes
+ #7141.
+
+
+ [fernando] - Update to poppler-0.38.0. Good simplification of
+ instructions. Fixes
+ #7140.
+
+
+ [fernando] - Update to nano-2.4.3. Fixes
+ #7139.
+
+
+ [fernando] - cmake-3.4.0: Minor re-reword of the tests
+ explanations.
+
+
+
+
November 17th, 2015
diff --git a/packages.ent b/packages.ent
index ea07aa29a4..af23565cb8 100644
--- a/packages.ent
+++ b/packages.ent
@@ -58,7 +58,7 @@
-
+
@@ -185,7 +185,7 @@
-
+
@@ -219,7 +219,7 @@
-
+
@@ -480,7 +480,7 @@
-
+
diff --git a/postlfs/editors/nano.xml b/postlfs/editors/nano.xml
index 6d716eec26..6f9e81bdb1 100644
--- a/postlfs/editors/nano.xml
+++ b/postlfs/editors/nano.xml
@@ -6,9 +6,9 @@
-
+
-
+
]>
diff --git a/x/lib/gtk+3.xml b/x/lib/gtk+3.xml
index d6620cdfe7..54fef2afd5 100644
--- a/x/lib/gtk+3.xml
+++ b/x/lib/gtk+3.xml
@@ -6,10 +6,10 @@
-
+
-
+
]>