7fc9190f0e
* gcc is kept at -Np0, because of void-cross
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From c4963107ee97b6bf045b805ed3b8f9f824c62ccb Mon Sep 17 00:00:00 2001
|
|
From: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
|
|
Date: Thu, 4 Apr 2013 14:47:19 +0100
|
|
Subject: [PATCH] Fix #628184 - Giggle does not display diff for files that
|
|
have spaces in names
|
|
|
|
Git diff is compliant to GNU patch expected format:
|
|
when a filename contains a SP a TAB is added.
|
|
See Git's commit 1a9eb3b9d50367bee8fe85022684d812816fe531
|
|
|
|
Signed-off-by: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
|
|
---
|
|
src/giggle-diff-view.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git src/giggle-diff-view.c src/giggle-diff-view.c
|
|
index ff6bbe3..2fbb8eb 100644
|
|
--- a/src/giggle-diff-view.c
|
|
+++ b/src/giggle-diff-view.c
|
|
@@ -665,6 +665,11 @@ diff_view_parse_patch (GiggleDiffView *view)
|
|
}
|
|
} else if (g_str_has_prefix (line, "--- a/") || g_str_has_prefix (line, "+++ b/")) {
|
|
g_free (filename); filename = g_strdup (line + 6);
|
|
+ if (strchr(filename, ' ')) {
|
|
+ /* Remove trailing TAB added by git for GNU patch compatibility */
|
|
+ size_t len = strlen (filename);
|
|
+ filename[len-1] = '\0';
|
|
+ }
|
|
}
|
|
|
|
g_free (line);
|