Source: obconf-qt 
Version: 0.9.0+20151227-1 
Severity: wishlist
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: locale
X-Debbugs-Cc: reproducible-builds@lists.alioth.debian.org

Hi,

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

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

Regards,
-- 
Dhole
diff -Nru obconf-qt-0.9.0+20151227/debian/changelog 
obconf-qt-0.9.0+20151227/debian/changelog
--- obconf-qt-0.9.0+20151227/debian/changelog   2015-12-27 01:16:30.000000000 
+0100
+++ obconf-qt-0.9.0+20151227/debian/changelog   2016-02-25 00:19:06.000000000 
+0100
@@ -1,3 +1,10 @@
+obconf-qt (0.9.0+20151227-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix misdetection as binary input in grep when LC_ALL=C 
+
+ -- Eduard Sanou <dh...@openmailbox.org>  Thu, 25 Feb 2016 00:19:00 +0100
+
 obconf-qt (0.9.0+20151227-1) unstable; urgency=medium
 
   * Cherry-picked upstream version 0.9.0+20151227.
diff -Nru obconf-qt-0.9.0+20151227/debian/patches/series 
obconf-qt-0.9.0+20151227/debian/patches/series
--- obconf-qt-0.9.0+20151227/debian/patches/series      1970-01-01 
01:00:00.000000000 +0100
+++ obconf-qt-0.9.0+20151227/debian/patches/series      2016-02-25 
00:19:24.000000000 +0100
@@ -0,0 +1 @@
+unicode-grep.patch
diff -Nru obconf-qt-0.9.0+20151227/debian/patches/unicode-grep.patch 
obconf-qt-0.9.0+20151227/debian/patches/unicode-grep.patch
--- obconf-qt-0.9.0+20151227/debian/patches/unicode-grep.patch  1970-01-01 
01:00:00.000000000 +0100
+++ obconf-qt-0.9.0+20151227/debian/patches/unicode-grep.patch  2016-02-25 
00:19:34.000000000 +0100
@@ -0,0 +1,22 @@
+Author: Eduard Sanou <dh...@openmailbox.org>
+Description: Fix misdetection as binary input when LC_ALL=C
+
+--- obconf-qt-0.9.0+20151227.orig/cmake/LXQtTranslateDesktop.cmake
++++ obconf-qt-0.9.0+20151227/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()

Attachment: signature.asc
Description: PGP signature

_______________________________________________
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Reply via email to