[pkg-lxqt-devel] Bug#815898: lximage-qt: please make the build reproducible

[Dhole]

Source: lximage-qt 
Version: 0.4.0+20160108-1 
Severity: wishlist
Tags: patch
User: reproducible-builds at lists.alioth.debian.org
Usertags: locale
X-Debbugs-Cc: reproducible-builds at lists.alioth.debian.org

Hi,

While working on the "reproducible builds" effort [1], we have noticed
that lximage-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, lximage-qt can be built reproducibly in our current
experimental framework.


 [1]: https://wiki.debian.org/ReproducibleBuilds

 Regards,

-- 
Dhole
-------------- next part --------------
diff -Nru lximage-qt-0.4.0+20160108/debian/changelog lximage-qt-0.4.0+20160108/debian/changelog
--- lximage-qt-0.4.0+20160108/debian/changelog	2016-02-07 22:55:45.000000000 +0100
+++ lximage-qt-0.4.0+20160108/debian/changelog	2016-02-24 23:43:03.000000000 +0100
@@ -1,3 +1,10 @@
+lximage-qt (0.4.0+20160108-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix misdetection as binary input in grep when LC_ALL=C 
+
+ -- Eduard Sanou <dhole at openmailbox.org>  Wed, 24 Feb 2016 23:42:25 +0100
+
 lximage-qt (0.4.0+20160108-1) unstable; urgency=medium
 
   * Cherry-picked new upstream version 0.4.0+20160108. 
diff -Nru lximage-qt-0.4.0+20160108/debian/patches/series lximage-qt-0.4.0+20160108/debian/patches/series
--- lximage-qt-0.4.0+20160108/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ lximage-qt-0.4.0+20160108/debian/patches/series	2016-02-24 23:43:31.000000000 +0100
@@ -0,0 +1 @@
+unicode-grep.patch
diff -Nru lximage-qt-0.4.0+20160108/debian/patches/unicode-grep.patch lximage-qt-0.4.0+20160108/debian/patches/unicode-grep.patch
--- lximage-qt-0.4.0+20160108/debian/patches/unicode-grep.patch	1970-01-01 01:00:00.000000000 +0100
+++ lximage-qt-0.4.0+20160108/debian/patches/unicode-grep.patch	2016-02-24 23:44:58.000000000 +0100
@@ -0,0 +1,22 @@
+Author: Eduard Sanou <dhole at openmailbox.org>
+Description: Fix misdetection as binary input when LC_ALL=C
+
+--- lximage-qt-0.4.0+20160108.orig/cmake/LXQtTranslateDesktop.cmake
++++ lximage-qt-0.4.0+20160108/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()
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-lxqt-devel/attachments/20160225/894e5bb8/attachment.sig>