Commits

Barry Schwartz  committed e08a412

GNU patch (borrowed from Exherbo)

  • Participants
  • Parent commits 2b5ebeb

Comments (0)

Files changed (3)

File packages/gnu/patch/files/patch-2.6.1-binary-silent.patch

+Source: Andreas Gruenbacher <agruen@suse.de>
+Upstream: yes
+Reason: Fix the --binary option when used together with --silent
+
+* src/pch.c (there_is_another_patch): Set p_strip_trailing_cr
+to false if no_strip_trailing_cr is set independent of the verbosity.
+This broke the --binary option in combination with --silent.
+diff --git a/src/pch.c b/src/pch.c
+index 8e039ff..1653ee4 100644
+--- a/src/pch.c
++++ b/src/pch.c
+@@ -257,14 +257,15 @@ there_is_another_patch (bool need_header, mode_t *file_type)
+ 	    diff_type == GIT_BINARY_DIFF ? "a git binary diff" :
+ 	    "an ed script" );
+ 
++    if (no_strip_trailing_cr)
++      p_strip_trailing_cr = false;
++
+     if (verbosity != SILENT)
+       {
+ 	if (p_indent)
+ 	  say ("(Patch is indented %lu space%s.)\n",
+ 	       (unsigned long int) p_indent, p_indent==1?"":"s");
+-	if (no_strip_trailing_cr)
+-	  p_strip_trailing_cr = false;
+-	else if (p_strip_trailing_cr)
++	if (p_strip_trailing_cr)
+ 	  say ("(Stripping trailing CRs from patch.)\n");
+ 	if (! inname)
+ 	  {
+-- 
+1.7.1
+

File packages/gnu/patch/patch-2.6.1-r1.exheres-0

+# Copyright 2007 Bryan Østergaard
+# Distributed under the terms of the GNU General Public License v2
+
+require gnu [ suffix=xz ]
+
+SUMMARY="Tool used for applying patches such as produced by diff"
+
+LICENCES="GPL-3"
+SLOT="0"
+PLATFORMS="~amd64"
+MYOPTIONS=""
+
+DEPENDENCIES="
+    test:
+        gnu/ed
+"
+
+DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}/${PNV}-binary-silent.patch" )
+

File profiles/system.conf

 gnu/gawk
 gnu/grep
 gnu/m4
+gnu/patch
 gnu/sed
 
 gnu/gzip