[blog] 01/03: 134: Tidy the __FILE__ section a little.

[Chris Lamb]

This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository blog.

commit 895128e5551edc41b1384a7ed1881ae66c2c9f25
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Nov 22 08:58:16 2017 +0900

    134: Tidy the __FILE__ section a little.
---
 drafts/134.mdwn | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/drafts/134.mdwn b/drafts/134.mdwn
index 8d8d672..cbadeef 100644
--- a/drafts/134.mdwn
+++ b/drafts/134.mdwn
@@ -45,25 +45,26 @@ Qt tests and `__FILE__`
 
 Our [patched
 GCC](https://tests.reproducible-builds.org/debian/index_repositories.html) that
-we use for testing Debian unstable, has uncovered an interesting issue with
+we use for testing Debian unstable has uncovered an interesting issue with
 certain Qt [build-time test
 suites](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=876901). The issue is
 that test suites using `QFINDTESTDATA` depend on `__FILE__` to expand to
-something that may be reused after compilation as a real filesystem path, when
-starting from the same working directory as the original compilation. However,
-this behaviour is not explicitly guaranteed by formal documentation about
-`__FILE__`, and thus when it is rewritten to be build-path-independent by a
-combination of our patched dpkg and GCC, the Qt tests break because their usage
-is no longer expanded to a real path as they expected.
-
-Several very short patches were suggested to resolve this issue. This includes
+something that may be reused after compilation as a real filesystem path when
+starting from the same working directory as the original compilation.
+
+However, this behaviour is not explicitly guaranteed by formal documentation
+about `__FILE__`, and thus when it is rewritten to be build-path-independent (by
+a combination of our patched dpkg and GCC), the Qt tests break because their
+usage is no longer expanded to a real path as they expected.
+
+Several very short patches were suggested to resolve this issue, including
 a one-liner that allows our patched GCC to specifically rewrite `__FILE__` in
-Qt test code to a real path, that takes advantage of the ability to specify
-multiple mappings in [BUILD_PATH_PREFIX_MAP](https://reproducible-builds.org/specs/build-path-prefix-map/).
+Qt test code to a real path which takes advantage of the ability to specify
+multiple mappings using [BUILD_PATH_PREFIX_MAP](https://reproducible-builds.org/specs/build-path-prefix-map/).
 
-Separately, work is under way to [address the other unrelated
+Separately, [work is under way to address the other unrelated
 concerns](https://lists.alioth.debian.org/pipermail/reproducible-builds/Week-of-Mon-20170814/009124.html)
-raised about the patch by GCC upstream [back in August](https://gcc.gnu.org/ml/gcc-patches/2017-08/msg00232.html).
+raised about the patch by [GCC upstream back in August](https://gcc.gnu.org/ml/gcc-patches/2017-08/msg00232.html).
 
 
 Packages reviewed and fixed, and bugs filed

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/blog.git