Source: pcmanfm-qt Version: 0.10.1-1 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: timestamps X-Debbugs-Cc: reproducible-bui...@lists.alioth.debian.org
Hi, While working on the "reproducible builds" effort [1], we have noticed that pcmanfm-qt could not be built reproducibly. When processing translation files and using a non-UTF8 locale, grep misdetects them as binary files and embeds the line: "Binary file (standard input) matches" The attached patch fixes this by telling grep to treat the input as text. Once applied, pcmanfm-qt can be built reproducibly in our current experimental framework. [1]: https://wiki.debian.org/ReproducibleBuilds Regards, -- Dhole
diff -Nru pcmanfm-qt-0.10.1/debian/changelog pcmanfm-qt-0.10.1/debian/changelog
--- pcmanfm-qt-0.10.1/debian/changelog 2016-02-07 15:28:09.000000000 +0100
+++ pcmanfm-qt-0.10.1/debian/changelog 2016-02-23 11:31:01.000000000 +0100
@@ -1,3 +1,10 @@
+pcmanfm-qt (0.10.1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix misdetection as binary input when LC_ALL=C
+
+ -- Eduard Sanou <dh...@openmailbox.org> Tue, 23 Feb 2016 11:30:33 +0100
+
pcmanfm-qt (0.10.1-1) unstable; urgency=medium
* New upstream release.
diff -Nru pcmanfm-qt-0.10.1/debian/patches/series
pcmanfm-qt-0.10.1/debian/patches/series
--- pcmanfm-qt-0.10.1/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ pcmanfm-qt-0.10.1/debian/patches/series 2016-02-23 11:31:21.000000000
+0100
@@ -0,0 +1 @@
+unicode-grep.patch
diff -Nru pcmanfm-qt-0.10.1/debian/patches/unicode-grep.patch
pcmanfm-qt-0.10.1/debian/patches/unicode-grep.patch
--- pcmanfm-qt-0.10.1/debian/patches/unicode-grep.patch 1970-01-01
01:00:00.000000000 +0100
+++ pcmanfm-qt-0.10.1/debian/patches/unicode-grep.patch 2016-02-23
11:59:06.000000000 +0100
@@ -0,0 +1,23 @@
+Description: Fix misdetection as binary input when LC_ALL=C
+
+Index: pcmanfm-qt-0.10.1/cmake/LXQtTranslateDesktop.cmake
+===================================================================
+--- pcmanfm-qt-0.10.1.orig/cmake/LXQtTranslateDesktop.cmake
++++ pcmanfm-qt-0.10.1/cmake/LXQtTranslateDesktop.cmake
+@@ -71,13 +71,13 @@ function(lxqt_translate_desktop _RESULT)
+ set(_pattern "'\\[.*]\\s*='")
+ if (_translations)
+ add_custom_command(OUTPUT ${_outFile}
+- COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} >
${_outFile}
+- COMMAND grep -h ${_pattern} ${_translations} >> ${_outFile}
++ COMMAND grep -a -v "'#TRANSLATIONS_DIR='" ${_inFile} >
${_outFile}
++ COMMAND grep -a -h ${_pattern} ${_translations} >> ${_outFile}
+ COMMENT "Generating ${_fileName}${_fileExt}"
+ )
+ else()
+ add_custom_command(OUTPUT ${_outFile}
+- COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} >
${_outFile}
++ COMMAND grep -a -v "'#TRANSLATIONS_DIR='" ${_inFile} >
${_outFile}
+ COMMENT "Generating ${_fileName}${_fileExt}"
+ )
+ endif()
signature.asc
Description: PGP signature
